From 72cbe4f0664f8d9ebe99636f988b2cd19e58438d Mon Sep 17 00:00:00 2001
From: ZhanGSKen <zhangsken@188.com>
Date: Sat, 18 Oct 2025 13:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=90=90=E5=8F=B8=E7=B1=BB?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contacts/build.gradle                                      | 2 +-
 contacts/build.properties                                  | 4 ++--
 contacts/src/main/java/cc/winboll/studio/contacts/App.java | 4 ++--
 .../studio/contacts/activities/SettingsActivity.java       | 2 +-
 .../winboll/studio/contacts/adapters/CallLogAdapter.java   | 2 +-
 .../winboll/studio/contacts/adapters/ContactAdapter.java   | 7 ++++---
 .../studio/contacts/adapters/PhoneConnectRuleAdapter.java  | 4 +---
 .../java/cc/winboll/studio/contacts/bobulltoon/TomCat.java | 2 +-
 .../studio/contacts/fragments/ContactsFragment.java        | 2 +-
 .../cc/winboll/studio/contacts/fragments/LogFragment.java  | 1 -
 .../cc/winboll/studio/contacts/receivers/MainReceiver.java | 2 +-
 .../winboll/studio/contacts/widgets/APPStatusWidget.java   | 3 +--
 12 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/contacts/build.gradle b/contacts/build.gradle
index 1b7291c..9278e0e 100644
--- a/contacts/build.gradle
+++ b/contacts/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     // 应用介绍页类库
     api 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
+    //api 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     
diff --git a/contacts/build.properties b/contacts/build.properties
index e679e4f..97246ad 100644
--- a/contacts/build.properties
+++ b/contacts/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Oct 18 12:57:07 HKT 2025
+#Sat Oct 18 05:13:11 GMT 2025
 stageCount=19
 libraryProject=
 baseVersion=15.3
 publishVersion=15.3.18
-buildCount=0
+buildCount=3
 baseBetaVersion=15.3.19
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/App.java b/contacts/src/main/java/cc/winboll/studio/contacts/App.java
index 9c255ae..2bd4287 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/App.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java
@@ -7,8 +7,8 @@ package cc.winboll.studio.contacts;
  */
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
-import com.hjq.toast.ToastUtils;
 
 public class App extends GlobalApplication {
 
@@ -30,7 +30,7 @@ public class App extends GlobalApplication {
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.toast_custom_view);
         //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
         
     }
 
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
index 0e8e1bc..9639f61 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
@@ -36,8 +36,8 @@ import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.views.DuInfoTextView;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
 import java.util.List;
 
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
index 13edc1e..1f28263 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
@@ -23,7 +23,7 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.CallLogModel;
 import cc.winboll.studio.contacts.utils.ContactUtils;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
index a0230c4..f686615 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
@@ -21,10 +21,10 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.ContactModel;
-import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
-import com.hjq.toast.ToastUtils;
-import java.util.List;
 import cc.winboll.studio.contacts.utils.ContactUtils;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import java.util.List;
 
 public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
 
@@ -71,6 +71,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
 									clipboard.setPrimaryClip(clip);
 									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
 								} else if (nItemId == R.id.item_calllog_phonenumber_edit_contact) {
+									//ToastUtils.show("Test");
 									Long nContactId = ContactUtils.getContactIdByPhone(mContext, contact.getNumber());
 									ContactUtils.jumpToEditContact(mContext, contact.getNumber(), nContactId);
 								}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
index 443ca9b..d44cf1c 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
@@ -7,7 +7,6 @@ package cc.winboll.studio.contacts.adapters;
  */
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -21,9 +20,8 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.views.LeftScrollView;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
index d787975..18e5830 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
@@ -9,7 +9,7 @@ import android.content.Context;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileOutputStream;
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
index b3926e4..7dabcee 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
@@ -31,7 +31,7 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.ContactAdapter;
 import cc.winboll.studio.contacts.beans.ContactModel;
 import cc.winboll.studio.libappbase.LogUtils;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java
index a5cf183..81b8369 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java
@@ -14,7 +14,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.libappbase.LogView;
-import com.hjq.toast.ToastUtils;
 
 public class LogFragment extends Fragment {
 
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
index 61bb49f..b666084 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
@@ -10,7 +10,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import cc.winboll.studio.contacts.services.MainService;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.lang.ref.WeakReference;
 
 public class MainReceiver extends BroadcastReceiver {
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java
index b9482a6..58968fd 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java
@@ -13,9 +13,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.widget.RemoteViews;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.threads.MainServiceThread;
 import cc.winboll.studio.libappbase.LogUtils;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 
 public class APPStatusWidget extends AppWidgetProvider {