diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 74dca20..a7d4404 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 @@ -172,7 +172,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -281,7 +281,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,6 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 74dca20..a7d4404 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 @@ -172,7 +172,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -281,7 +281,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,6 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); 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 e05135f..e579099 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 @@ -145,7 +145,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 74dca20..a7d4404 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 @@ -172,7 +172,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -281,7 +281,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,6 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); 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 e05135f..e579099 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 @@ -145,7 +145,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 a6c9ed0..c419d6d 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 @@ -170,7 +170,7 @@ }); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,6 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 74dca20..a7d4404 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 @@ -172,7 +172,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -281,7 +281,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,6 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); 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 e05135f..e579099 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 @@ -145,7 +145,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 a6c9ed0..c419d6d 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 @@ -170,7 +170,7 @@ }); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,6 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 3a639fc..ade2370 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -143,7 +143,7 @@ caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -204,6 +204,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 74dca20..a7d4404 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 @@ -172,7 +172,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -281,7 +281,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,6 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); 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 e05135f..e579099 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 @@ -145,7 +145,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 a6c9ed0..c419d6d 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 @@ -170,7 +170,7 @@ }); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,6 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 3a639fc..ade2370 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -143,7 +143,7 @@ caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -204,6 +204,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 91e8238..a661617 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 @@ -212,7 +212,7 @@ * */ if (!TextUtils.isEmpty(audioUrl)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); } } @@ -298,7 +298,7 @@ //图片九宫格 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -479,7 +479,7 @@ /** * 案卷录音 * */ - //TODO + //TODO 未完 // AudioPopupWindow.create(this, new AudioPopupWindow.IWindowListener() { // @Override // public void onViewCreated(PopupWindow window, ImageView imageView, TextView textView) { @@ -627,6 +627,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/build.gradle b/app/build.gradle index b4885b4..be0e8b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,9 @@ targetSdkVersion 33 versionCode 1003 versionName "1.0.0.3" - + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } manifestPlaceholders = [GETUI_APPID: "rD5OSy72eI8v86VDdfdrO8"] } 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 f6c06e4..3bb0567 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java index 8e89953..9eead0a 100644 --- a/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java +++ b/app/src/main/java/com/casic/dcms/model/ShopFeatureBean.java @@ -35,7 +35,7 @@ private String dutyname; private String dutyrange; @SerializedName("gis.sde.店铺三包.area") - private String _$GisSdeArea121; // FIXME check this code + private String _$GisSdeArea121; private String notes; private int objectid; private String objid; 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 900a8cd..a395adf 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -167,7 +167,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index fd59c27..7c4ac65 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -185,6 +185,7 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 e8e0ca3..7f29c81 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 @@ -113,10 +113,10 @@ //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 2, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 2, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -192,6 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); + handleRealPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); @@ -287,6 +288,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); + punishRealPaths.remove(position); punishImageAdapter.notifyDataSetChanged(); } }); 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 3747306..956e5c2 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 @@ -175,7 +175,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 String url = StringHelper.appendCompleteURL(audioFile); Log.d(TAG, "onChanged: " + url); // binding.audioPlayerView.setAudioSource(); @@ -256,8 +256,6 @@ }); } binding.caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); - //TODO 服务器返回数据缺少此字段，暂时注掉 -// binding.caseHandleTimeView.setText(); } } }); @@ -305,7 +303,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,6 +360,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); checkImageAdapter.notifyDataSetChanged(); } }); 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 afd5656..3d61cb4 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 @@ -169,7 +169,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 43c961e..64bae62 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 65cd4c0..eda7a8b 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 @@ -151,7 +151,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 21b601e..1e45608 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 @@ -149,7 +149,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 74dca20..a7d4404 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 @@ -172,7 +172,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -281,7 +281,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,6 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); handleImageAdapter.notifyDataSetChanged(); } }); 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 e05135f..e579099 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 @@ -145,7 +145,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } 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 a6c9ed0..c419d6d 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 @@ -170,7 +170,7 @@ }); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,6 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 3a639fc..ade2370 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -143,7 +143,7 @@ caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -204,6 +204,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 91e8238..a661617 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 @@ -212,7 +212,7 @@ * */ if (!TextUtils.isEmpty(audioUrl)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); } } @@ -298,7 +298,7 @@ //图片九宫格 int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -479,7 +479,7 @@ /** * 案卷录音 * */ - //TODO + //TODO 未完 // AudioPopupWindow.create(this, new AudioPopupWindow.IWindowListener() { // @Override // public void onViewCreated(PopupWindow window, ImageView imageView, TextView textView) { @@ -627,6 +627,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); imageAdapter.notifyDataSetChanged(); } }); 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 69c9d46..824c4ec 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 @@ -225,7 +225,7 @@ String audioFile = data.getAudioIdVerify(); if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); - //TODO + //TODO 未完 // binding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioFile)); } @@ -344,7 +344,7 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); - verifyImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); + verifyImageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(verifyImageAdapter); } @@ -490,6 +490,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); + realPaths.remove(position); verifyImageAdapter.notifyDataSetChanged(); } });