diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4e4383..6b6f98b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ @@ -43,7 +43,7 @@ android:name="networkCode" android:value="网络区域编码" /> finish()); PoliceEmergencyDetail detail = new Gson().fromJson(getIntent().getStringExtra("param"), PoliceEmergencyDetail.class); if (UiUtils.isNotEmpty(detail.getZp())) { - Glide.with(MyApplication.getInstance()).asBitmap().load(detail.getZp()).into(binding.ivZp); + Glide.with(App.getApp()).asBitmap().load(detail.getZp()).into(binding.ivZp); } setText(binding.tvJcjbh, detail.getJcjbh());//报警编号 setText(binding.tvBjjyqk, detail.getBjjyqk());//报警内容 diff --git a/app/src/main/java/com/police/policedatasystem/adapter/KeyPersonAdapter.java b/app/src/main/java/com/police/policedatasystem/data/adapter/KeyPersonAdapter.java similarity index 88% rename from app/src/main/java/com/police/policedatasystem/adapter/KeyPersonAdapter.java rename to app/src/main/java/com/police/policedatasystem/data/adapter/KeyPersonAdapter.java index 1541678..5b60884 100644 --- a/app/src/main/java/com/police/policedatasystem/adapter/KeyPersonAdapter.java +++ b/app/src/main/java/com/police/policedatasystem/data/adapter/KeyPersonAdapter.java @@ -1,11 +1,11 @@ -package com.police.policedatasystem.adapter; +package com.police.policedatasystem.data.adapter; import android.widget.ImageView; import com.bumptech.glide.Glide; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.viewholder.BaseViewHolder; -import com.police.policedatasystem.MyApplication; +import com.police.policedatasystem.App; import com.police.policedatasystem.R; import com.police.policedatasystem.model.KeyPerson; import com.police.policedatasystem.util.UiUtils; @@ -24,7 +24,7 @@ public class KeyPersonAdapter extends BaseQuickAdapter { replaceFragment(dataFragment); binding.navBarGroup.navBarIcon1.setImageResource(R.mipmap.icon_data_selected); diff --git a/app/src/main/java/com/police/policedatasystem/activity/RotatedTextView.java b/app/src/main/java/com/police/policedatasystem/main/RotatedTextView.java similarity index 96% rename from app/src/main/java/com/police/policedatasystem/activity/RotatedTextView.java rename to app/src/main/java/com/police/policedatasystem/main/RotatedTextView.java index fa22b86..5b2a4cd 100644 --- a/app/src/main/java/com/police/policedatasystem/activity/RotatedTextView.java +++ b/app/src/main/java/com/police/policedatasystem/main/RotatedTextView.java @@ -1,4 +1,4 @@ -package com.police.policedatasystem.activity; +package com.police.policedatasystem.main; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/police/policedatasystem/util/Constants.java b/app/src/main/java/com/police/policedatasystem/util/Constants.java index 49ac0e8..a0be397 100644 --- a/app/src/main/java/com/police/policedatasystem/util/Constants.java +++ b/app/src/main/java/com/police/policedatasystem/util/Constants.java @@ -30,7 +30,23 @@ public final class Constants { */ public static final String KEY_PERSON_MESSAGE_COUNT_ID = "220000000000-3-0100-d29a1ec21b9e44dab6e69a26598b8b8e"; /** - * 重点人员信息详情 + * 申请事由类型获取 + */ + public static final String APPLY_TYPE_ID = "220000000000-3-0100-d6893e7ffbf04078817c7fd1b3a6b38b"; + /** + * 申请事由发起申请赋能 + */ + public static final String APPLY_COMMIT_ID = "220000000000-3-0100-2271052a92e14a0b952790e97d0f6457"; + /** + * 赋能列表查询 + */ + public static final String MINE_LIST_ID = "220000000000-3-0100-1558d4e5f1f149989b67f988fc7cb291"; + /** + * 赋能详情查询 + */ + public static final String MINE_DETAIL_ID = "220000000000-3-0100-8c3e36bb5bdb4ee8b55b4ad0c4a83d13"; + /** + * 组织机构id */ public static final String ORG_ID = "220000000000"; /** diff --git a/app/src/main/java/com/police/policedatasystem/util/UiUtils.java b/app/src/main/java/com/police/policedatasystem/util/UiUtils.java index bf05fca..10bf688 100644 --- a/app/src/main/java/com/police/policedatasystem/util/UiUtils.java +++ b/app/src/main/java/com/police/policedatasystem/util/UiUtils.java @@ -3,7 +3,7 @@ package com.police.policedatasystem.util; import android.util.Base64; import android.widget.Toast; -import com.police.policedatasystem.MyApplication; +import com.police.policedatasystem.App; import java.util.UUID; @@ -15,7 +15,7 @@ public class UiUtils { * @return 转换后的px值 */ public static int dp2Px(int dpValue) { - final float scale = MyApplication.getInstance().getResources().getDisplayMetrics().density; + final float scale = App.getApp().getResources().getDisplayMetrics().density; return Math.round((float) dpValue * scale); } public static String uuid() { @@ -23,7 +23,7 @@ public class UiUtils { } public static void toast(String str) { - MyApplication.getInstance().getHandler().post(() -> Toast.makeText(MyApplication.getInstance(), str, Toast.LENGTH_LONG).show()); + App.getApp().getHandler().post(() -> Toast.makeText(App.getApp(), str, Toast.LENGTH_LONG).show()); } public static boolean isEmpty(String str) { @@ -40,7 +40,7 @@ public class UiUtils { return !str.isEmpty(); } public static void ui(){ - MyApplication.getHandler().post(new Runnable() { + App.getHandler().post(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/com/police/policedatasystem/viewmodel/DataViewModel.java b/app/src/main/java/com/police/policedatasystem/viewmodel/DataViewModel.java index e712b92..9dabad9 100644 --- a/app/src/main/java/com/police/policedatasystem/viewmodel/DataViewModel.java +++ b/app/src/main/java/com/police/policedatasystem/viewmodel/DataViewModel.java @@ -3,8 +3,8 @@ package com.police.policedatasystem.viewmodel; import androidx.annotation.NonNull; import com.google.gson.Gson; -import com.police.policedatasystem.activity.KeyPersonDetailActivity; -import com.police.policedatasystem.activity.PoliceEmergencyDetailActivity; +import com.police.policedatasystem.data.activity.KeyPersonDetailActivity; +import com.police.policedatasystem.data.activity.PoliceEmergencyDetailActivity; import com.police.policedatasystem.fragment.DataFragment; import com.police.policedatasystem.http.CustomCallBack; import com.police.policedatasystem.http.requestparams.GetKeyPersonListParams; diff --git a/app/src/main/res/layout/activity_key_person_detail.xml b/app/src/main/res/layout/activity_key_person_detail.xml index 4ea204e..ea59bb0 100644 --- a/app/src/main/res/layout/activity_key_person_detail.xml +++ b/app/src/main/res/layout/activity_key_person_detail.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#f7f7f7" - tools:context=".activity.KeyPersonDetailActivity"> + tools:context=".data.activity.KeyPersonDetailActivity"> + tools:context=".data.activity.PoliceEmergencyDetailActivity"> com.police.policedatasystem +main:主要的公用类以及项目必须的唯一文件 +data:套餐 +apply:赋能 +mine:我的 + + + +初始构建项目时,下载的所有工具包列表: > Task :prepareKotlinBuildScriptModel UP-TO-DATE Download https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/8.1.1/gradle-8.1.1-sources.jar, took 563 ms (2.99 MB) Download https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.8.10/kotlin-gradle-plugin-1.8.10-sources.jar, took 2 m 37 s 128 ms (925.84 kB)