<contacts>APK 15.3.14 release Publish.

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 17 09:57:24 HKT 2025
-stageCount=12
+#Tue Aug 26 01:37:58 HKT 2025
+stageCount=15
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.11
+publishVersion=15.3.14
 buildCount=0
-baseBetaVersion=15.3.12
+baseBetaVersion=15.3.15

contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java

@@ -40,6 +40,10 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
         this.mContactUtils = ContactUtils.getInstance(mContext);
         this.callLogList = callLogList;
     }
+	
+	public void relaodContacts() {
+		this.mContactUtils.relaodContacts();
+	}
 
     @NonNull
     @Override

contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java

@@ -11,6 +11,7 @@ import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -154,6 +155,62 @@ public class TomCat {
     File getWorkingFolder() {
         return mContext.getExternalFilesDir(TAG);
     }
+	
+	public File getBoBullToonDataFolder() {
+		File fCheckRoot = getWorkingFolder();
+		if (fCheckRoot == null || !fCheckRoot.exists()) {
+			return fCheckRoot;
+		}
+
+		// 递归查找符合条件的文件夹
+		File targetFolder = findTargetFolder(fCheckRoot);
+		return targetFolder != null ? targetFolder : fCheckRoot;
+	}
+
+	/**
+	 * 递归查找同时包含LICENSE和README.md文件的文件夹
+	 */
+	private File findTargetFolder(File currentFolder) {
+		// 检查当前文件夹是否符合条件
+		if (hasRequiredFiles(currentFolder)) {
+			return currentFolder;
+		}
+
+		// 查找子文件夹（Java 7不支持方法引用，用匿名内部类过滤）
+		File[] subFolders = currentFolder.listFiles(new FileFilter() {
+				@Override
+				public boolean accept(File file) {
+					return file.isDirectory(); // 仅保留子文件夹
+				}
+			});
+
+		if (subFolders != null) {
+			for (File subFolder : subFolders) {
+				File result = findTargetFolder(subFolder);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * 检查文件夹中是否同时存在LICENSE和README.md文件
+	 */
+	private boolean hasRequiredFiles(File folder) {
+		if (folder == null || !folder.isDirectory()) {
+			return false;
+		}
+
+		// 检查两个文件是否同时存在且均为文件（非文件夹）
+		File licenseFile = new File(folder, "LICENSE");
+		File readmeFile = new File(folder, "README.md");
+
+		return licenseFile.exists() && licenseFile.isFile()
+			&& readmeFile.exists() && readmeFile.isFile();
+	}
 
 	public void cleanBoBullToon() {
 		String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
@@ -170,9 +227,9 @@ public class TomCat {
 
     public boolean loadPhoneBoBullToon() {
         listPhoneBoBullToon.clear();
-        File fBoBullToon = new File(getWorkingFolder(), "bobulltoon");
+        File fBoBullToon = getBoBullToonDataFolder();
         if (fBoBullToon.exists()) {
-            LogUtils.d(TAG, String.format("getWorkingFolder() %s", getWorkingFolder()));
+            LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %s", getWorkingFolder()));
             for (File userFolder : fBoBullToon.listFiles()) {
                 if (userFolder.isDirectory()) {
                     for (File recordFile : userFolder.listFiles()) {

contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java

@@ -161,4 +161,12 @@ public class CallLogFragment extends Fragment {
             _CallLogFragment.triggerUpdate();
         }
     }
+	
+	@Override
+	public void onResume() {
+		super.onResume();
+		//ToastUtils.show("onResume");
+		callLogAdapter.relaodContacts();
+		readCallLog();  // 窗口回显时更新通话记录
+	}
 }

contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java

@@ -163,5 +163,12 @@ public class ContactsFragment extends Fragment {
         }
         contactAdapter.notifyDataSetChanged();
     }
+	
+	@Override
+	public void onResume() {
+		super.onResume();
+		//ToastUtils.show("onResume");
+		readContacts();  // 窗口回显时更新联系人列表
+	}
 }
 

contacts/src/main/res/values/strings.xml

@@ -2,6 +2,6 @@
 <resources>
 
     <string name="app_name">Contacts</string>
-    <string name="default_bobulltoon_url">https://gitea.winboll.cc/Studio/BoBullToon/archive/main.zip</string>
+    <string name="default_bobulltoon_url">https://gitee.com/zhangsken/bobulltoon/repository/archive/main.zip</string>
 
 </resources>

timestamp/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 24 15:25:52 HKT 2025
-stageCount=3
+#Wed May 07 15:07:02 HKT 2025
+stageCount=2
 libraryProject=
 baseVersion=15.1
-publishVersion=15.1.2
+publishVersion=15.1.1
 buildCount=0
-baseBetaVersion=15.1.3
+baseBetaVersion=15.1.2

timestamp/src/main/java/cc/winboll/studio/timestamp/MainActivity.java

@@ -5,7 +5,6 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.Switch;
 import android.widget.TextView;
-import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogUtils;
@@ -13,8 +12,6 @@ import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.timestamp.MainService;
 import cc.winboll.studio.timestamp.R;
 import cc.winboll.studio.timestamp.utils.AppConfigsUtil;
-import cc.winboll.studio.timestamp.utils.ClipboardUtil;
-import cc.winboll.studio.timestamp.utils.TimeStampUtil;
 import com.hjq.toast.ToastUtils;
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -100,22 +97,4 @@ public class MainActivity extends AppCompatActivity {
         }
         return false;
     }
-	
-	public void onTimeStamp(View view) {
-		// 在这里编写按钮点击后要执行的代码
-		TimeStampUtil.getInstance(this).genTimeStamp();
-		String formattedDateTime = TimeStampUtil.getInstance(this).getTimeStampCopyString();
-		ClipboardUtil.copyTextToClipboard(this, formattedDateTime);
-		
-		// 更新时间戳文本框显示内容
-		EditText etTimeStamp = findViewById(R.id.et_timestamp);
-		etTimeStamp.setText(formattedDateTime);
-
-		// 输出一个提示音
-		TimeStampUtil.getInstance(this).playNotifyMusic(this);
-		
-		// 比如显示一个 Toast
-		Toast.makeText(this, "时间戳：\n" + TimeStampUtil.getInstance(this).getTimeStampCopyString() + "\n已拷贝到剪贴板。", Toast.LENGTH_SHORT).show();
-		MainService.updateCopiedTimeStamp();
-	}
 }

timestamp/src/main/java/cc/winboll/studio/timestamp/utils/NotificationHelper.java

@@ -130,10 +130,16 @@ public class NotificationHelper {
         mForegroundNotification.bigContentView = remoteViews;
 
         service.startForeground(ID_MSG_SERVICE, mForegroundNotification);
-		
-		TimeStampUtil.getInstance(service).playNotifyMusic(service);
+
+        // 播放默认短信铃声
+        Uri defaultSmsRingtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+        AudioPlayerUriUtil.playAudio(service, defaultSmsRingtoneUri);
+
+        // 播放应用铃声
+        // 获取MP3文件的Uri
+        Uri soundUri = Uri.parse("android.resource://" + service.getPackageName() + "/" + R.raw.diweiyi);
+        AudioPlayerUriUtil.playAudio(service, soundUri);
     }
-	
     
     
 

timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java

@@ -6,8 +6,6 @@ package cc.winboll.studio.timestamp.utils;
  * @Describe TimeStampUtil
  */
 import android.content.Context;
-import android.net.Uri;
-import cc.winboll.studio.timestamp.R;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -57,19 +55,4 @@ public class TimeStampUtil {
         String formattedDateTime = ldt.format(formatter);
         return formattedDateTime;
     }
-	
-
-	//
-	// 播放时间戳确定时的提示音乐
-	//
-	public static void playNotifyMusic(Context context) {
-        // 播放默认短信铃声
-        //Uri defaultSmsRingtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-        //AudioPlayerUriUtil.playAudio(context, defaultSmsRingtoneUri);
-
-        // 播放应用铃声
-        // 获取MP3文件的Uri
-        Uri soundUri = Uri.parse("android.resource://" + context.getPackageName() + "/" + R.raw.diweiyi);
-        AudioPlayerUriUtil.playAudio(context, soundUri);
-	}
 }

timestamp/src/main/res/layout/activity_main.xml

@@ -1,180 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-	<ScrollView
+	<com.google.android.material.appbar.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<Switch
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="启用时间戳常驻通知栏"
+			android:id="@+id/activitymainSwitch1"
+			android:onClick="onSetMainServiceStatus"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Show Format Preview:"
+			android:paddingRight="10dp"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Text"
+			android:id="@+id/tv_timestampformatstring"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<EditText
+			android:layout_width="0dp"
+			android:ems="10"
+			android:layout_height="wrap_content"
+			android:id="@+id/et_timestampformatstring"
+			android:layout_weight="1.0"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="ApplyShow"
+			android:id="@+id/btn_saveformatstring"
+			android:textAllCaps="false"
+			android:onClick="onSaveFormatString"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Copy Format Preview:"
+			android:paddingRight="10dp"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Text"
+			android:id="@+id/tv_timestampcopyformatstring"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<EditText
+			android:layout_width="0dp"
+			android:ems="10"
+			android:layout_height="wrap_content"
+			android:id="@+id/et_timestampcopyformatstring"
+			android:layout_weight="1.0"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="ApplyCopy"
+			android:id="@+id/btn_savecopyformatstring"
+			android:textAllCaps="false"
+			android:onClick="onSaveCopyFormatString"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:gravity="center_vertical|center_horizontal">
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0">
 
-		<LinearLayout
-			xmlns:app="http://schemas.android.com/apk/res-auto"
+		<cc.winboll.studio.libappbase.LogView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:orientation="vertical">
+			android:id="@+id/logview"/>
 
-			<com.google.android.material.appbar.AppBarLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-				<androidx.appcompat.widget.Toolbar
-					android:id="@+id/toolbar"
-					android:layout_width="match_parent"
-					android:layout_height="?attr/actionBarSize"
-					app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-			</com.google.android.material.appbar.AppBarLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="10dp">
-
-				<Switch
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:text="启用时间戳常驻通知栏"
-					android:id="@+id/activitymainSwitch1"
-					android:onClick="onSetMainServiceStatus"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Show Format Preview:"
-					android:paddingRight="10dp"/>
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Text"
-					android:id="@+id/tv_timestampformatstring"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="10dp">
-
-				<EditText
-					android:layout_width="0dp"
-					android:ems="10"
-					android:layout_height="wrap_content"
-					android:id="@+id/et_timestampformatstring"
-					android:layout_weight="1.0"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="ApplyShow"
-					android:id="@+id/btn_saveformatstring"
-					android:textAllCaps="false"
-					android:onClick="onSaveFormatString"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Copy Format Preview:"
-					android:paddingRight="10dp"/>
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Text"
-					android:id="@+id/tv_timestampcopyformatstring"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="10dp">
-
-				<EditText
-					android:layout_width="0dp"
-					android:ems="10"
-					android:layout_height="wrap_content"
-					android:id="@+id/et_timestampcopyformatstring"
-					android:layout_weight="1.0"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="ApplyCopy"
-					android:id="@+id/btn_savecopyformatstring"
-					android:textAllCaps="false"
-					android:onClick="onSaveCopyFormatString"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="当前截取的时间戳为："/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical|center_horizontal">
-
-				<ImageButton
-					android:layout_width="100dp"
-					android:layout_height="100dp"
-					android:onClick="onTimeStamp"
-					android:background="@drawable/ic_timestamp"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<EditText
-					android:layout_width="match_parent"
-					android:ems="10"
-					android:layout_height="wrap_content"
-					android:id="@+id/et_timestamp"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-	<cc.winboll.studio.libappbase.LogView
-		android:layout_width="match_parent"
-		android:layout_height="200dp"
-		android:id="@+id/logview"/>
+	</LinearLayout>
 
 </LinearLayout>