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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(context); } }); } 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(context); } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(this, id); } @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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 fb516b0..53755d8 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig(Context context) { + public void getMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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 fb516b0..53755d8 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig(Context context) { + public void getMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f6c296e..7e733d5 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(Context context, String caseState) { + public void getNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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 fb516b0..53755d8 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig(Context context) { + public void getMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f6c296e..7e733d5 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(Context context, String caseState) { + public void getNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 a667ec3..0933104 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -24,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { + public void getPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -56,7 +56,7 @@ }); } - public void obtainSubordinatePerson(Context context) { + public void getSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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 fb516b0..53755d8 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig(Context context) { + public void getMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f6c296e..7e733d5 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(Context context, String caseState) { + public void getNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 a667ec3..0933104 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -24,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { + public void getPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -56,7 +56,7 @@ }); } - public void obtainSubordinatePerson(Context context) { + public void getSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 91eecb6..8f7a086 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(Context context, String deptid) { + public void getPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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 fb516b0..53755d8 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig(Context context) { + public void getMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f6c296e..7e733d5 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(Context context, String caseState) { + public void getNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 a667ec3..0933104 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -24,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { + public void getPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -56,7 +56,7 @@ }); } - public void obtainSubordinatePerson(Context context) { + public void getSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 91eecb6..8f7a086 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(Context context, String deptid) { + public void getPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 28c88b3..ee22e37 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -94,7 +94,7 @@ }); } - public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { + public void getCleanRecordList(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() { 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 2dce1f5..933fba6 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(requireContext(), "05"); + homePageViewModel.getHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { 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 04ef284..f6c06e4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -59,12 +59,12 @@ @Override public void onResume() { - obtainLightList(); + getLightList(); super.onResume(); } - private void obtainLightList() { - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + private void getLightList() { + lightViewModel.getLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -75,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainLightList(); + getLightList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,7 +83,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainLightList(); + getLightList(); } }); @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.getLightList(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 f344da3..167472b 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(requireContext()); + lightViewModel.getLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -150,7 +150,7 @@ //Marker相关Layer graphicsOverlays = getBinding().mapView.getGraphicsOverlays(); //显示定位点附近路灯 - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -202,7 +202,7 @@ // minusList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(minusList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -245,7 +245,7 @@ // expandList.add(new Point(longitude, latitude, SpatialReferences.getWgs84())); // } // addPictureMarker(expandList); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -272,7 +272,7 @@ public void onClick(View v) { clearPictureMarker(); LoadingDialogHub.show(requireActivity(), "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(requireContext(), new ILocationListener() { + LocationHelper.getCurrentLocation(requireContext(), new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 164c129..46f4152 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 a4b13f9..c58705e 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(requireContext(), "", "", ""); + statusViewModel.getPersonByStatus(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 115fcbf..0eee524 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(requireContext(), "0"); + deptTreeViewModel.getDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.getPhoneBook(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 ce51012..4936cbb 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 @@ -54,11 +54,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); } @Override @@ -69,7 +69,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -77,7 +77,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -115,7 +115,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 bfebdbf..63ad653 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 @@ -55,11 +55,11 @@ @Override public void onResume() { super.onResume(); - obtainPackageCaseList(); + getPackageCaseList(); } - public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); } @Override @@ -70,7 +70,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -78,7 +78,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainPackageCaseList(); + getPackageCaseList(); } }); @@ -116,7 +116,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainPackageCaseList(); + getPackageCaseList(); } }); } else { 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 979c2af..617d5f5 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 cfbd747..aa90410 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } - private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + private void getCheckCaseList() { + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCheckCaseList(); + getCheckCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCheckCaseList(); + getCheckCaseList(); } }); } else { 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 2c1b24d..18912a1 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(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 093ac78..5c99564 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(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); + handleViewModel.getDeptStatusCaseList(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 56a9ded..b61d0dd 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(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); + handleViewModel.getDelayedOrPostCaseList(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 d49623d..b0249dd 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 @@ -82,11 +82,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override @@ -97,7 +97,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 e1b03e3..42178b1 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(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); + handleViewModel.getDelayedOrPostCaseList(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 3b51bc0..a93e468 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override @@ -96,7 +96,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 163e9bf..d8070ab 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } - private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); + private void getDeptStatusCaseList() { + handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override @@ -98,7 +98,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -106,7 +106,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } @@ -120,7 +120,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainDeptStatusCaseList(); + getDeptStatusCaseList(); } }); } else { 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 02d5216..7fe7e78 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 @@ -81,11 +81,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); + private void getHandleCaseList() { + caseViewModel.getHandledCaseList(requireContext(), pageIndex); } @Override @@ -95,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -103,7 +103,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -117,7 +117,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 da6d89f..3e6c42b 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 @@ -83,11 +83,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } - private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); + private void getHandleCaseList() { + caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); } @Override @@ -97,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -105,7 +105,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainHandleCaseList(); + getHandleCaseList(); } }); } @@ -119,7 +119,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainHandleCaseList(); + getHandleCaseList(); } }); } else { 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 9699f83..758d891 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 1fd6397..dd5f461 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } - private void obtainOvertimeCaseList() { + private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainOvertimeCaseList(); + getOvertimeCaseList(); } }); } else { 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 86304c4..b79a697 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 ab0f277..89146a3 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 @@ -81,12 +81,12 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } - private void obtainUrgentCaseList() { + private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); } @Override @@ -96,7 +96,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -104,7 +104,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } @@ -118,7 +118,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainUrgentCaseList(); + getUrgentCaseList(); } }); } else { 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 2fed724..ce6732a 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 @@ -84,11 +84,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override @@ -99,7 +99,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -107,7 +107,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -121,7 +121,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { 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 e2be630..4a7903b 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 @@ -85,11 +85,11 @@ public void onResume() { super.onResume(); pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } - public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + public void getVerifyCaseList() { + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override @@ -100,7 +100,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -108,7 +108,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } @@ -122,7 +122,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainVerifyCaseList(); + getVerifyCaseList(); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4b4c2f5..db5a5c7 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -25,7 +25,7 @@ NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index 60f188c..3028e00 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -34,7 +34,7 @@ /** * 高德sdk定位 */ - public static void obtainCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { + public static void getCurrentLocation(Context context, ILocationListener listener, boolean isOnce) { AMapLocationClient mLocationClient = new AMapLocationClient(context); AMapLocationClientOption mLocationOption = new AMapLocationClientOption(); //设置定位模式为高精度模式，AMapLocationMode.Battery_Saving为低功耗模式，AMapLocationMode.Device_Sensors是仅设备模式 @@ -67,7 +67,7 @@ /** * 查询社区信息 */ - public static void obtainCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { + public static void getCurrentCommunity(FeatureLayer communityLayer, QueryParameters queryParameters, ICommunityListener listener) { ListenableFuture communityFeatureResult = communityLayer.getFeatureTable().queryFeaturesAsync(queryParameters); communityFeatureResult.addDoneListener(new Runnable() { @Override diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 5c17f54..a90a244 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -23,7 +23,7 @@ * PublicKey校验 */ @GET("/config/baseConfig") - Observable obtainPublicKey(); + Observable getPublicKey(); /** * 登录并获取Token @@ -272,7 +272,7 @@ * isShopCase 否 string 是否三包案件0-否，1-是 */ @GET("/case/queryListPage") - Observable obtainCaseList( + Observable getCaseList( @Header("token") String token, @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @@ -293,13 +293,13 @@ * http://111.198.10.15:11409/case/detail/1372735305680994306 */ @GET("/case/detail/{id}") - Observable obtainCaseDetail(@Header("token") String token, @Path("id") String id); + Observable getCaseDetail(@Header("token") String token, @Path("id") String id); /** * 获取案件流转记录 */ @GET("/process/historicalRecords") - Observable obtainCaseProcess( + Observable getCaseProcess( @Header("token") String token, @Query("processId") String processId ); @@ -459,7 +459,7 @@ * 获取流转下级节点 */ @GET("/process/nextNodes") - Observable obtainProcessNextNode( + Observable getProcessNextNode( @Header("token") String token, @Query("caseState") String caseState ); @@ -468,7 +468,7 @@ * 获取常见语句 */ @GET("/dict/code/commonApproval") - Observable obtainCommonSentence(@Header("token") String token); + Observable getCommonSentence(@Header("token") String token); /** * 案卷处理 @@ -619,7 +619,7 @@ * http://111.198.10.15:11409/sanitation/toiletClean/listPage */ @GET("/sanitation/toiletClean/listPage") - Observable obtainToiletCleanRecord( + Observable getToiletCleanRecord( @Header("token") String token, @Query("userId") String userId, @Query("keywords") String keywords, @@ -635,7 +635,7 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainPackageWorkListPage( + Observable getPackageWorkListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -648,7 +648,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("isShop") String isShop, @Query("limit") int limit, @@ -695,7 +695,7 @@ * http://111.198.10.15:11409/case/workListPage/?offset=1&limit=15 */ @GET("/case/workListPage") - Observable obtainWorkListPage( + Observable getWorkListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -707,7 +707,7 @@ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 */ @GET("/case/toProcessListPage") - Observable obtainProcessListPage( + Observable getProcessListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -719,7 +719,7 @@ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage( + Observable getCompletedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -731,7 +731,7 @@ * http://111.198.10.15:11409/case/secIsPostponeListPage/?offset=1&limit=15 */ @GET("/case/secIsPostponeListPage") - Observable obtainPostponeListPage( + Observable getPostponeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -743,7 +743,7 @@ * http://111.198.10.15:11409/case/secIsDelayListPage/?offset=1&limit=15 */ @GET("/case/secIsDelayListPage") - Observable obtainDelayedListPage( + Observable getDelayedListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -755,7 +755,7 @@ * http://111.198.10.15:11409/case/deptAuthAuditListPage/?offset=1&limit=15 */ @GET("/case/deptAuthAuditListPage") - Observable obtainCaseAuthorizeListPage( + Observable getCaseAuthorizeListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -767,7 +767,7 @@ * http://111.198.10.15:11409/case/deptAdjustInstructionListPage/?offset=1&limit=15 */ @GET("/case/deptAdjustInstructionListPage") - Observable obtainCaseAdjustListPage( + Observable getCaseAdjustListPage( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -780,7 +780,7 @@ */ @FormUrlEncoded @POST("/mgr/simplelist") - Observable obtainNextProcessPerson( + Observable getNextProcessPerson( @Header("token") String token, @Field("roleTips") String roleTips ); @@ -792,7 +792,7 @@ */ @FormUrlEncoded @POST("/bridge/maintain/contentByType") - Observable obtainMaintainContent( + Observable getMaintainContent( @Header("token") String token, @Field("type") String type ); @@ -821,7 +821,7 @@ * http://111.198.10.15:11409/bridge/maintain/listPage?startDate=2021-06-21&endDate=2021-06-22 */ @GET("/bridge/maintain/listPage") - Observable obtainMaintainRecord( + Observable getMaintainRecord( @Header("token") String token, @Query("startDate") String beginDate, @Query("endDate") String endDate, @@ -835,7 +835,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampListPage?limit=15&offset=1 */ @GET("/lightCr/overview/lampListPage") - Observable obtainLightList( + Observable getLightList( @Header("token") String token, @Query("limit") int limit, @Query("offset") int offset @@ -847,7 +847,7 @@ * http://111.198.10.15:11409/lampCr/overview/lampList */ @GET("/lightCr/overview/lampList") - Observable obtainLightList(@Header("token") String token); + Observable getLightList(@Header("token") String token); /** * 路灯详情 @@ -855,7 +855,7 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail( + Observable getLightDetail( @Header("token") String token, @Query("lampId") String lampId ); @@ -879,7 +879,7 @@ * http://111.198.10.15:11409/smartwell/alarm/list?status=1 */ @GET("/smartwell/alarm/list") - Observable obtainAlarmList( + Observable getAlarmList( @Header("token") String token, @Query("status") String status, @Query("limit") int limit, @@ -919,7 +919,7 @@ * http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc */ @GET("/smartwell/well/list") - Observable obtainWellList( + Observable getWellList( @Header("token") String token, @Query("sort") String sort, @Query("order") String order, @@ -958,7 +958,7 @@ * http://111.198.10.15:13002/arcgis/rest/services/fsw/MapServer/0/query?f=json&inSr=4326&outSR=4326&outFields=*&returnGeometry=true&where=编号='GX_WSD_4107_HLDD154' */ @GET("/arcgis/rest/services/fsw/MapServer/0/query") - Observable obtainWellDetail( + Observable getWellDetail( @Query("f") String f, @Query("inSr") String inSr, @Query("outSR") String outSR, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 50936f1..fd0349f 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -31,7 +31,7 @@ * 验证PublicKey */ public static Observable authenticate() { - return api.obtainPublicKey(); + return api.getPublicKey(); } /** @@ -203,7 +203,7 @@ String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset ) { - return api.obtainCaseList( + return api.getCaseList( AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, LocaleConstant.PAGE_LIMIT, offset @@ -214,14 +214,14 @@ * 获取案件详情 */ public static Observable getCaseDetailResult(String id) { - return api.obtainCaseDetail(AuthenticationHelper.getToken(), id); + return api.getCaseDetail(AuthenticationHelper.getToken(), id); } /** * 获取案件流转记录 */ public static Observable getCaseProcessResult(String processId) { - return api.obtainCaseProcess(AuthenticationHelper.getToken(), processId); + return api.getCaseProcess(AuthenticationHelper.getToken(), processId); } /** @@ -357,14 +357,14 @@ * @param caseState 字典值 */ public static Observable getProcessNextNodeResult(String caseState) { - return api.obtainProcessNextNode(AuthenticationHelper.getToken(), caseState); + return api.getProcessNextNode(AuthenticationHelper.getToken(), caseState); } /** * 获取常见语句 */ public static Observable getCommonSentenceResult() { - return api.obtainCommonSentence(AuthenticationHelper.getToken()); + return api.getCommonSentence(AuthenticationHelper.getToken()); } /** @@ -469,7 +469,7 @@ * 公厕打扫记录 */ public static Observable getCleanRecordResult(String userId, String keywords, String beginDate, String endDate, int offset) { - return api.obtainToiletCleanRecord( + return api.getToiletCleanRecord( AuthenticationHelper.getToken(), userId, keywords, beginDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -478,14 +478,14 @@ * 三包待办 */ public static Observable getPackageWorkListResult(String isShop, int offset) { - return api.obtainPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getPackageWorkListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** * 三包已办 */ public static Observable getCompletedListResult(String isShop, int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), isShop, LocaleConstant.PAGE_LIMIT, offset); } /** @@ -514,63 +514,63 @@ * 二级派遣员待办案卷 */ public static Observable getWorkListResult(int offset) { - return api.obtainWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getWorkListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员待处理案卷 */ public static Observable getProcessListResult(int offset) { - return api.obtainProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getProcessListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级派遣员已办案卷 */ public static Observable getCompletedListResult(int offset) { - return api.obtainCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCompletedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级缓办待处理 */ public static Observable getPostponeListResult(int offset) { - return api.obtainPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getPostponeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 二级延期待处理 */ public static Observable getDelayedListResult(int offset) { - return api.obtainDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getDelayedListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门授权审核 */ public static Observable getCaseAuthorizeResult(int offset) { - return api.obtainCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAuthorizeListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 部门调整批示 */ public static Observable getCaseAdjustResult(int offset) { - return api.obtainCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); + return api.getCaseAdjustListPage(AuthenticationHelper.getToken(), LocaleConstant.PAGE_LIMIT, offset); } /** * 获取下级处置员 */ public static Observable getProcessPersonResult() { - return api.obtainNextProcessPerson(AuthenticationHelper.getToken(), "process"); + return api.getNextProcessPerson(AuthenticationHelper.getToken(), "process"); } /** * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return api.getMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -587,21 +587,21 @@ * 桥梁养护记录 */ public static Observable getMaintainRecordResult(String startDate, String endDate, int offset) { - return api.obtainMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); + return api.getMaintainRecord(AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset); } /** * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return api.getLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return api.getLightList(AuthenticationHelper.getToken()); } /** @@ -609,7 +609,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return api.getLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -623,7 +623,7 @@ * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return api.getAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -644,7 +644,7 @@ * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return api.getWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); } @@ -674,7 +674,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return api.getWellDetail( "json", "4326", "4326", "*", true, where ); } 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 42a7df9..900a8cd 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 03e21f9..878eedc 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(this, processId); + commonDataViewModel.getCaseProcess(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/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 4f5d84a..704b2b1 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(this, id); + caseViewModel.getCaseDetail(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(context); + commonViewModel.getCommonSentence(context); } }); 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 26b23e9..5b3f444 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 f946aa1..b57c50c 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(context); + authenticateViewModel.getPublicKey(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 694b22d..f254120 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -114,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(this); + mapConfigViewModel.getMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -145,7 +145,7 @@ pushViewModel = new ViewModelProvider(this).get(PushViewModel.class); //获取配置项 - obtainProjectConfig(); + getProjectConfig(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UpdateLocationService.class)); } else { @@ -199,7 +199,7 @@ }); } - private void obtainProjectConfig() { + private void getProjectConfig() { imei = ContextHub.getSimCardSerialNumber(this); //公厕图层ID 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 fde999f..99c88e5 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(context, eorc); + commonDataViewModel.getLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(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(context); + commonDataViewModel.getCaseStatus(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 a5cc7c2..ed65c59 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 @@ -150,7 +150,7 @@ binding.submitButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 9cc6cb9..6211249 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 @@ -99,7 +99,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } @Override @@ -113,7 +113,7 @@ binding.dateView.setText(startDate + "~" + endDate); pageIndex = 1; - obtainMaintainRecord(startDate, endDate); + getMaintainRecord(startDate, endDate); } }).build().show(); } @@ -124,7 +124,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -132,13 +132,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } - private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); + private void getMaintainRecord(String start, String end) { + bridgeViewModel.getMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -148,7 +148,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainMaintainRecord("", ""); + getMaintainRecord("", ""); } }); } else { 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 34318f3..5e950ec 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(this, id); + caseViewModel.getCaseDetail(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 ab46e0f..22f1db0 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { 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 3b54516..1e3ea8d 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 @@ -128,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -370,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 6ecbbde..afd5656 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 bcea1a6..43c961e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 2a127e4..65cd4c0 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 5f169a8..21b601e 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(context); + personViewModel.getSubordinatePerson(context); } } }); 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 45fe5f9..f535aa3 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 cf84e27..e05135f 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 19c34ae..b7fb8b0 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -123,7 +123,7 @@ } //设置定位点 - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { if (aMapLocation != null) { @@ -196,7 +196,7 @@ queryParameters.setGeometry(clickPoint);//查询点击位置所在的社区 //不管是事件还是部件，都的需要社区信息 - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { if (caseType.equals("事件")) { @@ -207,7 +207,7 @@ }); switch (caseType) { case "部件": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -251,7 +251,7 @@ break; case "三包上报": case "商铺变更": - LocationHelper.obtainCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { + LocationHelper.getCurrentCommunity(communityLayer, queryParameters, new ICommunityListener() { @Override public void onCommunityFeatureGet(Feature feature) { //先取社区信息，再取部件信息 @@ -439,7 +439,7 @@ binding.mapView.setViewpointScaleAsync(binding.mapView.getMapScale() * 2); } else if (id == R.id.removeToLocalView) { LoadingDialogHub.show(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 fcb9d25..cafd770 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(context, 1, true); + caseViewModel.getHandleCaseList(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(this, 1, true); + caseViewModel.getHandleCaseList(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(this, 1000, 1, false); + caseViewModel.getVerifyCaseList(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(this, 1000, 1, false); + caseViewModel.getCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 3501674..666c1eb 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -95,7 +95,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(DisplayMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 f456e3d..31ede76 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(this, alarmTotal, 1); + alarmViewModel.getAlarmList(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(context, queryParam); + wellViewModel.getWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index 173d37c..ca90ce3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -136,7 +136,7 @@ @Override public void onClick(View view) { LoadingDialogHub.show(WorkerOnMapActivity.this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @Override public void onAMapLocationGet(AMapLocation aMapLocation) { 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 06b0cb9..c8c3612 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 @@ -135,7 +135,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -147,11 +147,11 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } - private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); + private void getAlarmList() { + alarmViewModel.getAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -162,7 +162,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -170,7 +170,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainAlarmList(); + getAlarmList(); } }); } @@ -182,7 +182,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainAlarmList(); + getAlarmList(); } }); } else { 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 25fee91..419a405 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 @@ -129,7 +129,7 @@ //取消成功之后自动刷新列表 isRefresh = true; pageIndex = 1; - obtainWellList(); + getWellList(); } else { StringHub.show(context, "操作失败，请重试"); } @@ -139,12 +139,12 @@ @Override protected void onResume() { - obtainWellList(); + getWellList(); super.onResume(); } - private void obtainWellList() { - wellViewModel.obtainWellList(this, pageIndex); + private void getWellList() { + wellViewModel.getWellList(this, pageIndex); } @Override @@ -155,7 +155,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainWellList(); + getWellList(); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -163,7 +163,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainWellList(); + getWellList(); } }); } 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 82ada76..86ce34c 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 @@ -105,7 +105,7 @@ protected void onResume() { super.onResume(); pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } @Override @@ -117,7 +117,7 @@ @Override public void onDateRangeSelected(String startDate, String endDate) { binding.dateView.setText(startDate + "~" + endDate); - obtainCleanRecordList(startDate, endDate); + getCleanRecordList(startDate, endDate); } }).build().show(); } @@ -128,7 +128,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -136,13 +136,13 @@ public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } - private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); + private void getCleanRecordList(String start, String end) { + toiletViewModel.getCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -152,7 +152,7 @@ @Override public void onClick(View v) { pageIndex = 1; - obtainCleanRecordList("", ""); + getCleanRecordList("", ""); } }); } else { 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 842a428..2b57750 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 @@ -91,7 +91,7 @@ String systemTime = LongHub.timestampToCompleteDate(System.currentTimeMillis()); //默认显示结束时间 binding.endTimeView.setText(systemTime); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.getCurrentLocation(this, new ILocationListener() { @SuppressLint("SetTextI18n") @Override public void onAMapLocationGet(AMapLocation aMapLocation) { @@ -281,7 +281,7 @@ binding.signInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LocationHelper.obtainCurrentLocation(context, new ILocationListener() { + LocationHelper.getCurrentLocation(context, new ILocationListener() { @SuppressLint("SetTextI18n") @Override 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 a96f234..be0e30a 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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 f4616bc..778d632 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 @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } else { 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 31ab95c..fa6b16d 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(this, id); + caseViewModel.getCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { 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 79304a3..a9c8723 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(this, id); + caseViewModel.getCaseDetail(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(context, String.valueOf(position + 1)); + commonDataViewModel.getLargeType(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(context, eorc, typeId); + commonDataViewModel.getSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); + nodeViewModel.getNextNode(context, String.valueOf(data.getCaseState())); } }); 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 af6de31..0337998 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(Context context, int limit, int offset) { + public void getAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { 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 b82ecf4..25a937e 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey(Context context) { + public void getPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { 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 7d3d613..4e18568 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -60,7 +60,7 @@ }); } - public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { + public void getMaintainRecord(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() { 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 f0eafec..9ccbf83 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { + public void getVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -88,7 +88,7 @@ }); } - public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { + public void getCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -126,7 +126,7 @@ }); } - public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { + public void getHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -163,7 +163,7 @@ }); } - public void obtainHandledCaseList(Context context, int offset) { + public void getHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -195,7 +195,7 @@ }); } - public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { + public void getUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -227,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { + public void getOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -259,7 +259,7 @@ }); } - public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { + public void getShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -404,7 +404,7 @@ }); } - public void obtainCaseDetail(Context context, String id) { + public void getCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 0685160..14ed18a 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(Context context, String eorc) { + public void getLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -63,7 +63,7 @@ }); } - public void obtainSmallType(Context context, String eorc, String typeId) { + public void getSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainCaseStatus(Context context) { + public void getCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainCommonSentence(Context context) { + public void getCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -159,7 +159,7 @@ }); } - public void obtainCaseProcess(Context context, String processId) { + public void getCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { 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 14a15b7..3e55a1e 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -34,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { + public void getDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -86,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { + public void getDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -129,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { + public void getDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); 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 c114bc2..5f534a4 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(Context context, String pid) { + public void getDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 50d3342..7da3d59 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(Context context, String resourceType) { + public void getHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f9eb368..9414111 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(Context context, int limit, int offset) { + public void getLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -95,7 +95,7 @@ }); } - public void obtainLightOnMap(Context context) { + public void getLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -127,7 +127,7 @@ }); } - public void obtainLightDetail(Context context, String lampId) { + public void getLightDetail(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 fb516b0..53755d8 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig(Context context) { + public void getMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 f6c296e..7e733d5 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -22,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(Context context, String caseState) { + public void getNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 a667ec3..0933104 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -24,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { + public void getPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -56,7 +56,7 @@ }); } - public void obtainSubordinatePerson(Context context) { + public void getSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 91eecb6..8f7a086 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(Context context, String deptid) { + public void getPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override 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 28c88b3..ee22e37 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -94,7 +94,7 @@ }); } - public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { + public void getCleanRecordList(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() { 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 574e05a..f4a100d 100644 --- a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java @@ -27,7 +27,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData operationActionModel = new MutableLiveData<>(); - public void obtainWellList(Context context, int offset) { + public void getWellList(Context context, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getWellListResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -62,7 +62,7 @@ }); } - public void obtainWellDetail(Context context, String queryParam) { + public void getWellDetail(Context context, String queryParam) { loadState.setValue(LoadState.Loading); Observable wellDetailObservable = RetrofitServiceManager.getWellDetailResult(queryParam); ObserverSubscriber.addSubscribe(wellDetailObservable, new ObserverSubscriber.OnObserverCallback() {