<appbase>APK 15.9.2 release Publish.

README.md

@@ -115,6 +115,7 @@
 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
 ## ★. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
+## ★. 项目模块编译环境设置(必须) 在根目录拷贝 gradle.properties-androidx-demo 或者 gradle.properties-android-demo 文件为 gradle.properties。
 ## ★. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
 ## ★. 应用签名密钥 keystore 设置问题。一般调试编译只需用【Termux】cd 进 GenKeyStore 目录执行 $ bash gen_debug_keystore.sh 命令即可完成设置。
 ## ☆. 应用 WiBoLL 签名密钥配置问题<非必须考虑>。设置时需要 clone 【keystore】模块源码并拷贝模块目录的 appkey.jks 与 appkey.keystore 到项目根目录即可。

androidxdemo/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libaes:15.9.2'
-    api 'cc.winboll.studio:libapputils:15.8.2'
+    api 'cc.winboll.studio:libapputils:15.8.4'
-    api 'cc.winboll.studio:libappbase:15.8.2'
+    api 'cc.winboll.studio:libappbase:15.8.4'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 12:49:47 GMT 2025
+#Sat Jun 28 05:02:54 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=26
+buildCount=27
 baseBetaVersion=15.0.1

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 17 11:39:14 HKT 2025
+#Sun Aug 17 19:23:49 HKT 2025
-stageCount=2
+stageCount=3
 libraryProject=libappbase
 baseVersion=15.9
-publishVersion=15.9.1
+publishVersion=15.9.2
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.9.3

contacts/build.gradle

@@ -45,9 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.9.3'
+    api 'cc.winboll.studio:libaes:15.9.2'
-    api 'cc.winboll.studio:libapputils:15.8.5'
+    api 'cc.winboll.studio:libapputils:15.8.4'
-    api 'cc.winboll.studio:libappbase:15.9.5'
+    api 'cc.winboll.studio:libappbase:15.8.4'
     
     // 权限请求框架：https://github.com/getActivity/XXPermissions
     api 'com.github.getActivity:XXPermissions:18.63'

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 06:05:42 CST 2025
+#Thu Jul 17 09:57:24 HKT 2025
-stageCount=17
+stageCount=12
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.16
+publishVersion=15.3.11
 buildCount=0
-baseBetaVersion=15.3.17
+baseBetaVersion=15.3.12

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

@@ -1,10 +1,5 @@
 package cc.winboll.studio.contacts;
 
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
- * @Date 2025/08/30 14:32
- * @Describe 主窗口
- */
 import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -13,7 +8,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
@@ -47,7 +41,7 @@ import java.util.List;
 
 final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
-    public static final String TAG = "MainActivity";
+	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_HOME_ACTIVITY = 0;
     public static final int REQUEST_ABOUT_ACTIVITY = 1;
@@ -61,10 +55,13 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
     MainServiceBean mMainServiceBean;
     private TabLayout tabLayout;
     private ViewPager viewPager;
-    private List<View> views; 
+    private List<View> views; //用来存放放进ViewPager里面的布局
+    //实例化存储imageView（导航原点）的集合
     ImageView[] imageViews;
-    LinearLayout linearLayout;
+    //MyPagerAdapter adapter;//适配器
-    int currentPoint = 0;
+    MyPagerAdapter pagerAdapter;
+    LinearLayout linearLayout;//下标所在在LinearLayout布局里
+    int currentPoint = 0;//当前被选中中页面的下标
 
     private TelephonyManager telephonyManager;
     private MyPhoneStateListener phoneStateListener;
@@ -73,6 +70,30 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
 
     private static final int DIALER_REQUEST_CODE = 1;
 
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
+
+//    @Override
+//    public APPInfo getAppInfo() {
+//        String szBranchName = "contacts";
+//
+//        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
+//        appInfo.setAppName("Contacts");
+//        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
+//        appInfo.setAppDescription("Contacts Description");
+//        appInfo.setAppGitName("APP");
+//        appInfo.setAppGitOwner("Studio");
+//        appInfo.setAppGitAPPBranch(szBranchName);
+//        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+//        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
+//        appInfo.setAppAPKName("Contacts");
+//        appInfo.setAppAPKFolderName("Contacts");
+//        return appInfo;
+//        return null;
+//    }
+
 
     @Override
     public Activity getActivity() {
@@ -86,62 +107,89 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
+        //if (prosessIntents(getIntent())) return;
+        // 以下正常创建主窗口
         super.onCreate(savedInstanceState);
         _MainActivity = this;
         setContentView(R.layout.activity_main);
 
-        // 初始化工具栏（仅加载基础UI）
+        // 初始化工具栏
-        mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
+        mToolbar = findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
+//        if (isEnableDisplayHomeAsUp()) {
+//            // 显示后退按钮
+//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+//        }
         getSupportActionBar().setSubtitle(TAG);
 
-        tabLayout = (TabLayout) findViewById(R.id.tabLayout);
+        tabLayout = findViewById(R.id.tabLayout);
-        viewPager = (ViewPager) findViewById(R.id.viewPager);
+        viewPager = findViewById(R.id.viewPager);
 
-        // 创建Fragment列表（仅实例化，不加载数据）
+        // 创建Fragment列表和标题列表
-        fragmentList = new ArrayList<Fragment>();
+        fragmentList = new ArrayList<>();
-        tabTitleList = new ArrayList<String>();
+        tabTitleList = new ArrayList<>();
         fragmentList.add(CallLogFragment.newInstance(0));
-        fragmentList.add(ContactsFragment.newInstance(1)); // 延迟加载联系人数据
+        fragmentList.add(ContactsFragment.newInstance(1));
         fragmentList.add(LogFragment.newInstance(2));
         tabTitleList.add("通话记录");
         tabTitleList.add("联系人");
         tabTitleList.add("应用日志");
 
-        // 设置ViewPager适配器
+        // 设置ViewPager的适配器
         MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
         viewPager.setAdapter(adapter);
 
-        // 关键：关闭预加载，仅当前页初始化
-        viewPager.setOffscreenPageLimit(0);
-
         // 关联TabLayout和ViewPager
         tabLayout.setupWithViewPager(viewPager);
 
-        // 初始化服务状态（延迟启动非核心服务）
+
+
+//        initData();
+//        initView();
+//        //initPoint();//调用初始化导航原点的方法
+//        viewPager.addOnPageChangeListener(this);//滑动事件
+
+        //ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
+        //MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+        //viewPager.setAdapter(pagerAdapter);
+        //TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1);
+        //tabLayout.setupWithViewPager(viewPager);
+
+//        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+//        if (mMainServiceBean == null) {
+//            mMainServiceBean = new MainServiceBean();
+//        }
+//        cbMainService = findViewById(R.id.activitymainCheckBox1);
+//        cbMainService.setChecked(mMainServiceBean.isEnable());
+//        cbMainService.setOnClickListener(new View.OnClickListener(){
+//                @Override
+//                public void onClick(View view) {
+//                    if (cbMainService.isChecked()) {
+//                        MainService.startMainService(MainActivity.this);
+//                    } else {
+//                        MainService.stopMainService(MainActivity.this);
+//                    }
+//                }
+//            });
+
         MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
         if (mMainServiceBean == null) {
             mMainServiceBean = new MainServiceBean();
             MainServiceBean.saveBean(this, mMainServiceBean);
         }
         if (mMainServiceBean.isEnable()) {
-            // 延迟1秒启动服务，避免阻塞启动
+            MainService.startMainService(this);
-            new Handler().postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						MainService.startMainService(MainActivity.this);
-					}
-				}, 1000);
         }
 
-        // 初始化电话状态监听（基础功能保留）
+        // 初始化TelephonyManager和PhoneStateListener
         telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
         phoneStateListener = new MyPhoneStateListener();
         telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
     }
 
 
-    // ViewPager适配器（Java 7语法）
+    // ViewPager的适配器
     private class MyPagerAdapter extends FragmentPagerAdapter {
 
         private List<Fragment> fragmentList;
@@ -178,22 +226,91 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         _MainActivity.startActivity(intent);
     }
 
-    // OnPageChangeListener接口实现
+    //初始化view，即显示的图片
-    @Override
+//    void initView() {
-    public void onPageScrollStateChanged(int state) {}
+//        viewPager = findViewById(R.id.activitymainViewPager1);
+//        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+//        viewPager.setAdapter(pagerAdapter);
+//        //adapter = new MyPagerAdapter(views);
+//        //viewPager = findViewById(R.id.activitymainViewPager1);
+//        //viewPager.setAdapter(adapter);
+//        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
+//        //initPoint();//初始化页面下方的点
+//        viewPager.setOnPageChangeListener(this);
+//
+//    }
 
-    @Override
+    //初始化所要显示的布局
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+//    void initData() {
+//        LayoutInflater inflater = LayoutInflater.from(getActivity());
+//        View view1 = inflater.inflate(R.layout.fragment_call_log, viewPager, false);
+//        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
+//        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
+//
+//        views = new ArrayList<>();
+//        views.add(view1);
+//        views.add(view2);
+//        views.add(view3);
+//    }
 
-    @Override
+//    void initPoint() {
-    public void onPageSelected(int position) {}
+//        imageViews = new ImageView[5];//实例化5个图片
+//        for (int i = 0; i < linearLayout.getChildCount(); i++) {
+//            imageViews[i] = (ImageView) linearLayout.getChildAt(i);
+//            imageViews[i].setImageResource(R.drawable.ic_launcher);
+//            imageViews[i].setOnClickListener(this);//点击导航点，即可跳转
+//            imageViews[i].setTag(i);//重复利用实例化的对象
+//        }
+//        currentPoint = 0;//默认第一个坐标
+//        imageViews[currentPoint].setImageResource(R.drawable.ic_launcher);
+//    }
 
+    //OnPageChangeListener接口要实现的三个方法
+    /*    onPageScrollStateChanged(int state)
+     此方法是在状态改变的时候调用，其中state这个参数有三种状态：
+     SCROLL_STATE_DRAGGING（1）表示用户手指“按在屏幕上并且开始拖动”的状态
+     （手指按下但是还没有拖动的时候还不是这个状态，只有按下并且手指开始拖动后log才打出。）
+     SCROLL_STATE_IDLE（0）滑动动画做完的状态。
+     SCROLL_STATE_SETTLING（2）在“手指离开屏幕”的状态。*/
     @Override
-    public void onClick(View v) {}
+    public void onPageScrollStateChanged(int state) {
+
+    }
+    /*    onPageScrolled(int position, float positionOffset, int positionOffsetPixels)
+     当页面在滑动的时候会调用此方法，在滑动被停止之前，此方法回一直得到调用。其中三个参数的含义分别为：
+
+     position :当前页面，即你点击滑动的页面（从A滑B，则是A页面的position。
+     positionOffset:当前页面偏移的百分比
+     positionOffsetPixels:当前页面偏移的像素位置*/
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+    /*    onPageSelected(int position)
+     此方法是页面滑动完后得到调用，position是你当前选中的页面的Position（位置编号）
+     (从A滑动到B，就是B的position)*/
+    public void onPageSelected(int position) {
+
+//        ImageView preView = imageViews[currentPoint];
+//        preView.setImageResource(R.drawable.ic_launcher);
+//        ImageView currView = imageViews[position];
+//        currView.setImageResource(R.drawable.ic_launcher);
+//        currentPoint = position;
+    }
+
+    //小圆点点击事件
+    @Override
+    public void onClick(View v) {
+        // TODO Auto-generated method stub
+        //通过getTag(),可以判断是哪个控件
+//        int i = (Integer) v.getTag();
+//        viewPager.setCurrentItem(i);//直接跳转到某一个页面的情况
+    }
 
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
+        //setSubTitle("");
     }
 
     private class MyPhoneStateListener extends PhoneStateListener {
@@ -219,31 +336,109 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         LogUtils.d(TAG, "onDestroy() SOS");
     }
 
+
+
+    //
+    // 处理传入的 Intent 数据
+    //
+//    boolean prosessIntents(Intent intent) {
+//        if (intent == null 
+//            || intent.getAction() == null
+//            || intent.getAction().equals(""))
+//            return false;
+//
+//        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
+//            try {
+//                WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance();
+//                String tag = clazzActivity.getTag();
+//                LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
+//                Intent subIntent = new Intent(this, UnitTestActivity.class);
+//                subIntent.setAction(intent.getAction());
+//                File file = new File(getCacheDir(), UUID.randomUUID().toString());
+//                //取出文件uri
+//                Uri uri = intent.getData();
+//                if (uri == null) {
+//                    uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+//                }
+//                //获取文件真实地址
+//                String szSrcPath = UriUtils.getFileFromUri(getApplication(), uri);
+//                if (TextUtils.isEmpty(szSrcPath)) {
+//                    return false;
+//                }
+//
+//                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
+//                //startWinBoLLActivity(subIntent, tag);
+//                WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class);
+//            } catch (IllegalAccessException | InstantiationException | IOException e) {
+//                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+//                // 函数处理异常返回失败
+//                return false;
+//            }
+//        } else {
+//            LogUtils.d(TAG, "prosessIntents|" + intent.getAction() + "|yet");
+//            return false;
+//        }
+//        return true;
+//    }
+
+//    @Override
+//    public String getTag() {
+//        return TAG;
+//    }
+
+//    @Override
+//    public void onBackPressed() {
+//        exit();
+//    }
+//
+//    void exit() {
+//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+//
+//            @Override
+//            public void onYes() {
+//                WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll();
+//            }
+//
+//            @Override
+//            public void onNo() {
+//            }
+//        };
+//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+//    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.item_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
+            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, CallActivity.class);
         }
+//        } else 
+//        if (item.getItemId() == R.id.item_exit) {
+//            exit();
+//            return true;
+//        }
         return super.onOptionsItemSelected(item);
     }
 
+
     @Override
     protected void onResume() {
         super.onResume();
     }
 
     /**
-     * 检查是否是系统默认电话应用
+     * Android M 及以上检查是否是系统默认电话应用
      */
     public boolean isDefaultPhoneCallApp() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             TelecomManager manger = (TelecomManager) getSystemService(TELECOM_SERVICE);
             if (manger != null && manger.getDefaultDialerPackage() != null) {
                 return manger.getDefaultDialerPackage().equals(getPackageName());
@@ -257,22 +452,35 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         if (manager == null) return false;
 
         for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(
-			Integer.MAX_VALUE)) {
+            Integer.MAX_VALUE)) {
             if (serviceClass.getName().equals(service.service.getClassName())) {
                 return true;
             }
         }
+
         return false;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        switch (resultCode) {
+//            case REQUEST_HOME_ACTIVITY : {
+//                    LogUtils.d(TAG, "REQUEST_HOME_ACTIVITY");
+//                    break;
+//                }
+//            case REQUEST_ABOUT_ACTIVITY : {
+//                    LogUtils.d(TAG, "REQUEST_ABOUT_ACTIVITY");
+//                    break;
+//                }
+//            default : {
+//                    super.onActivityResult(requestCode, resultCode, data);
+//                }
+//        }
         if (requestCode == DIALER_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
                 Toast.makeText(MainActivity.this, getString(R.string.app_name) + " 已成为默认电话应用",
-							   Toast.LENGTH_SHORT).show();
+                               Toast.LENGTH_SHORT).show();
             }
         }
     }
 }
-

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

@@ -40,10 +40,6 @@ 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/beans/ContactModel.java

@@ -1,9 +1,9 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/08/30 14:32
+ * @Date 2025/02/26 13:37:00
- * @Describe 联系人信息数据模型
+ * @Describe ContactModel
  */
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
@@ -18,18 +18,13 @@ public class ContactModel {
     private String name;
     private String number;
     private String pinyin;
-    // 新增：存储姓名的拼音首字母（如"啊牛"→"an"）
-    private String pinyinFirstLetter;
 
     public ContactModel(String name, String number) {
         this.name = name;
         this.number = number.replaceAll("\\s", "");
         this.pinyin = convertToPinyin(name);
-        // 初始化时生成拼音首字母
-        this.pinyinFirstLetter = convertToPinyinFirstLetter(name);
     }
 
-    // 原方法：转换为全拼（如"啊牛"→"aniu"）
     private String convertToPinyin(String chinese) {
         HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
         format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
@@ -38,55 +33,22 @@ public class ContactModel {
         StringBuilder pinyin = new StringBuilder();
         for (int i = 0; i < chinese.length(); i++) {
             char ch = chinese.charAt(i);
-            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { // 仅处理汉字
+            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) {
                 try {
                     String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
-                    if (pinyinArray != null && pinyinArray.length > 0) {
+                    if (pinyinArray != null) {
-                        pinyin.append(pinyinArray[0]); // 取第一个拼音（多音字默认首选项）
+                        pinyin.append(pinyinArray[0]);
                     }
                 } catch (BadHanyuPinyinOutputFormatCombination e) {
                     e.printStackTrace();
                 }
             } else {
-                pinyin.append(ch); // 非汉字直接拼接（如字母、数字、符号）
+                pinyin.append(ch);
             }
         }
         return pinyin.toString();
     }
 
-    // 新增：转换为拼音首字母（如"啊牛"→"an"）
-    private String convertToPinyinFirstLetter(String chinese) {
-        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
-        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
-        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-
-        StringBuilder firstLetters = new StringBuilder();
-        for (int i = 0; i < chinese.length(); i++) {
-            char ch = chinese.charAt(i);
-            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { // 仅处理汉字
-                try {
-                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
-                    if (pinyinArray != null && pinyinArray.length > 0) {
-                        // 取拼音的第一个字母（如"a"、"niu"→"a"、"n"）
-                        firstLetters.append(pinyinArray[0].charAt(0));
-                    }
-                } catch (BadHanyuPinyinOutputFormatCombination e) {
-                    e.printStackTrace();
-                }
-            } else {
-                // 非汉字可根据需求处理：此处保留原字符（如"李3"→"l3"，"张A"→"za"）
-                firstLetters.append(ch);
-            }
-        }
-        return firstLetters.toString();
-    }
-
-    // 新增：获取拼音首字母
-    public String getPinyinFirstLetter() {
-        return pinyinFirstLetter;
-    }
-
-    // 原有getter方法
     public String getName() {
         return name;
     }

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

@@ -11,7 +11,6 @@ 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;
@@ -155,62 +154,6 @@ 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(); // 替换为实际的目标文件夹路径
@@ -227,9 +170,9 @@ public class TomCat {
 
     public boolean loadPhoneBoBullToon() {
         listPhoneBoBullToon.clear();
-        File fBoBullToon = getBoBullToonDataFolder();
+        File fBoBullToon = new File(getWorkingFolder(), "bobulltoon");
         if (fBoBullToon.exists()) {
-            LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %s", getWorkingFolder()));
+            LogUtils.d(TAG, String.format("getWorkingFolder() %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,12 +161,4 @@ 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

@@ -1,18 +1,15 @@
 package cc.winboll.studio.contacts.fragments;
 
-
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/08/30 14:32
+ * @Date 2025/02/20 12:57:50
- * @Describe 联系人视图
+ * @Describe 联系人
  */
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.provider.ContactsContract;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -30,39 +27,24 @@ import androidx.recyclerview.widget.RecyclerView;
 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 java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
+
-import java.util.concurrent.Executors;
 
 public class ContactsFragment extends Fragment {
 
     public static final String TAG = "ContactsFragment";
-    private static final String ARG_PAGE = "ARG_PAGE";
-    private static final int REQUEST_READ_CONTACTS = 1;
 
+    private static final String ARG_PAGE = "ARG_PAGE";
     private int mPage;
+
+    private static final int REQUEST_READ_CONTACTS = 1;
     private RecyclerView recyclerView;
     private ContactAdapter contactAdapter;
+    private List<ContactModel> contactList = new ArrayList<>();
+    private List<ContactModel> originalContactList = new ArrayList<>();
     private EditText searchEditText;
-    private Button btnDial;
-    private boolean isViewInitialized = false; // 标记视图是否已初始化
-
-    // 静态缓存：全局复用联系人数据
-    private static List<ContactModel> sCachedOriginalList = new ArrayList<ContactModel>();
-    private static List<ContactModel> sCachedFilteredList = new ArrayList<ContactModel>();
-
-    // 当前页面数据容器
-    private List<ContactModel> contactList = new ArrayList<ContactModel>();
-    private List<ContactModel> originalContactList = new ArrayList<ContactModel>();
-
-    // 异步工具
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
-    private final Handler mainHandler = new Handler(Looper.getMainLooper());
-    private boolean isDataLoaded = false;
-
 
     public static ContactsFragment newInstance(int page) {
         Bundle args = new Bundle();
@@ -83,272 +65,103 @@ public class ContactsFragment extends Fragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        // 加载布局（已移除进度条相关代码）
+        return inflater.inflate(R.layout.fragment_contacts, container, false);
-        View view = inflater.inflate(R.layout.fragment_contacts, container, false);
-        return view;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        // 初始化RecyclerView
+        recyclerView = view.findViewById(R.id.contacts_recycler_view);
-        recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        contactList = new ArrayList<ContactModel>();
         contactAdapter = new ContactAdapter(getContext(), contactList);
         recyclerView.setAdapter(contactAdapter);
-        // 初始隐藏列表，数据加载后显示
-        recyclerView.setVisibility(View.GONE);
 
-        // 绑定搜索框和拨号按钮
+        searchEditText = view.findViewById(R.id.search_edit_text);
-        searchEditText = (EditText) view.findViewById(R.id.search_edit_text);
+        searchEditText.addTextChangedListener(new TextWatcher() {
-        btnDial = (Button) view.findViewById(R.id.btn_dial);
+                @Override
-        // 初始隐藏搜索相关控件，延迟到首次可见时显示
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        searchEditText.setVisibility(View.GONE);
+                }
-        btnDial.setVisibility(View.GONE);
-    }
 
-    // 首次可见时初始化资源
+                @Override
-    @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
-    public void onResume() {
+                    filterContacts(s.toString());
-        super.onResume();
+                }
-        if (!isViewInitialized) {
-            initSearchAndDial(); // 初始化搜索和拨号功能
-            checkContactPermission(); // 检查权限并加载数据
-            isViewInitialized = true;
-        }
-    }
 
-    // 初始化搜索框和拨号按钮
+                @Override
-    private void initSearchAndDial() {
+                public void afterTextChanged(Editable s) {
-        // 显示搜索相关控件
+                }
-        searchEditText.setVisibility(View.VISIBLE);
+            });
-        btnDial.setVisibility(View.VISIBLE);
 
-        // 搜索框防抖监听
-        searchEditText.addTextChangedListener(new DebounceTextWatcher(300) {
-				@Override
-				public void onDebounceTextChanged(String query) {
-					filterContacts(query);
-				}
-			});
-
-        // 拨号按钮点击事件
-        btnDial.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
-					if (phoneNumber.isEmpty()) {
-						ToastUtils.show("请输入号码");
-						return;
-					}
-					Intent intent = new Intent(Intent.ACTION_CALL);
-					intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-					intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-					startActivity(intent);
-				}
-			});
-    }
-
-    // 权限检查
-    private void checkContactPermission() {
         if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_READ_CONTACTS);
         } else {
-            loadContacts();
+            readContacts();
-        }
-    }
-
-    // 加载联系人（延迟到首次可见时）
-    private void loadContacts() {
-        // 若有缓存，直接复用
-        if (!sCachedOriginalList.isEmpty() && !sCachedFilteredList.isEmpty()) {
-            originalContactList.clear();
-            originalContactList.addAll(sCachedOriginalList);
-            contactList.clear();
-            contactList.addAll(sCachedFilteredList);
-            contactAdapter.notifyDataSetChanged();
-            recyclerView.setVisibility(View.VISIBLE); // 显示列表
-            isDataLoaded = true;
-            return;
         }
 
-        // 无缓存时异步加载
+        Button btnDial = view.findViewById(R.id.btn_dial);
-        if (!isDataLoaded) {
+        btnDial.setOnClickListener(new View.OnClickListener(){
-            recyclerView.setVisibility(View.GONE); // 加载中隐藏列表
+                @Override
+                public void onClick(View p1) {
 
-            executor.execute(new Runnable() {
+                    String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
-					@Override
+                    //phoneNumber = "+8616769764848";
-					public void run() {
+                    ToastUtils.show(phoneNumber);
-						// 子线程读取联系人
+                    Intent intent = new Intent(Intent.ACTION_CALL);
-						final List<ContactModel> tempList = readContactsInBackground();
+                    intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-
+                    // 添加 FLAG_ACTIVITY_NEW_TASK 标志
-						// 主线程更新UI
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-						mainHandler.post(new Runnable() {
+                    startActivity(intent);
-								@Override
-								public void run() {
-									// 更新缓存
-									sCachedOriginalList.clear();
-									sCachedOriginalList.addAll(tempList);
-									sCachedFilteredList.clear();
-									sCachedFilteredList.addAll(tempList);
-
-									// 更新当前列表
-									originalContactList.clear();
-									originalContactList.addAll(sCachedOriginalList);
-									contactList.clear();
-									contactList.addAll(sCachedFilteredList);
-									contactAdapter.notifyDataSetChanged();
-									LogUtils.d(TAG, String.format("联系人加载完成，共%d条数据", contactList.size()));
-
-									// 数据加载后显示列表
-									recyclerView.setVisibility(View.VISIBLE);
-									isDataLoaded = true;
-								}
-							});
-					}
-				});
-        }
-    }
-
-    // 子线程读取联系人
-    private List<ContactModel> readContactsInBackground() {
-        List<ContactModel> tempList = new ArrayList<ContactModel>();
-        Cursor cursor = null;
-        try {
-            // 查询联系人姓名和号码
-            cursor = requireContext().getContentResolver().query(
-                ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-                new String[]{
-                    ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME,
-                    ContactsContract.CommonDataKinds.Phone.NUMBER
-                },
-                null,
-                null,
-                ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC"
-            );
-
-            if (cursor != null && cursor.moveToFirst()) {
-                int nameIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
-                int numberIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
-
-                do {
-                    String name = cursor.getString(nameIndex);
-                    String number = cursor.getString(numberIndex).replaceAll("\\s", ""); // 去除空格
-                    tempList.add(new ContactModel(name, number));
-                } while (cursor.moveToNext());
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, "读取联系人失败：" + e);
-        } finally {
-            if (cursor != null) {
-                cursor.close(); // 关闭游标，避免内存泄漏
-            }
-        }
-        return tempList;
-    }
-
-    // 过滤联系人
-    private void filterContacts(String query) {
-        contactList.clear();
-        if (query.isEmpty()) {
-            contactList.addAll(originalContactList);
-            sCachedFilteredList.clear();
-            sCachedFilteredList.addAll(originalContactList);
-        } else {
-            String lowerQuery = query.toLowerCase();
-            for (ContactModel contact : originalContactList) {
-                // 匹配姓名、全拼、简拼、号码
-                boolean matchName = contact.getName().toLowerCase().contains(lowerQuery);
-                boolean matchPinyin = contact.getPinyin().toLowerCase().contains(lowerQuery);
-                boolean matchFirstLetter = contact.getPinyinFirstLetter().toLowerCase().contains(lowerQuery);
-                boolean matchNumber = contact.getNumber().contains(lowerQuery);
-
-                if (matchName || matchPinyin || matchFirstLetter || matchNumber) {
-                    contactList.add(contact);
                 }
-            }
+            });
-            sCachedFilteredList.clear();
-            sCachedFilteredList.addAll(contactList);
-        }
-        contactAdapter.notifyDataSetChanged();
-        // 过滤后确保列表可见
-        recyclerView.setVisibility(View.VISIBLE);
     }
 
-    // 权限回调
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == REQUEST_READ_CONTACTS) {
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                loadContacts(); // 授权后加载联系人
+                readContacts();
-            } else {
-                ToastUtils.show("请授予联系人权限以查看联系人列表");
-                recyclerView.setVisibility(View.VISIBLE); // 显示空列表
             }
         }
     }
 
-    // 防抖TextWatcher（Java 7实现）
+    private void readContacts() {
-    public abstract static class DebounceTextWatcher implements TextWatcher {
+        contactList.clear();
-        private final long debounceDelay;
+        originalContactList.clear();
-        private Handler handler = new Handler(Looper.getMainLooper());
+        Cursor cursor = requireContext().getContentResolver().query(
-        private Runnable pendingRunnable;
+            ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+            null,
+            null,
+            null,
+            ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC");
 
-        public DebounceTextWatcher(long debounceDelay) {
+        if (cursor != null) {
-            this.debounceDelay = debounceDelay;
+            while (cursor.moveToNext()) {
-        }
+                String name = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
-
+                String number = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
-        @Override
+                ContactModel contact = new ContactModel(name, number);
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                contactList.add(contact);
-            // 无需处理
+                originalContactList.add(contact);
-        }
-
-        @Override
-        public void onTextChanged(final CharSequence s, int start, int before, int count) {
-            // 移除之前的延迟任务
-            if (pendingRunnable != null) {
-                handler.removeCallbacks(pendingRunnable);
             }
-            // 延迟执行过滤
+            cursor.close();
-            pendingRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    onDebounceTextChanged(s.toString());
-                }
-            };
-            handler.postDelayed(pendingRunnable, debounceDelay);
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            // 无需处理
-        }
-
-        // 抽象方法：防抖后的回调
-        public abstract void onDebounceTextChanged(String query);
-    }
-
-    // 资源释放
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        executor.shutdown(); // 关闭线程池
-        mainHandler.removeCallbacksAndMessages(null); // 清除未执行任务
-    }
-
-    // Fragment隐藏/显示时的处理
-    @Override
-    public void onHiddenChanged(boolean hidden) {
-        super.onHiddenChanged(hidden);
-        if (!hidden && isDataLoaded) {
-            // 复用缓存数据并显示列表
-            contactList.clear();
-            contactList.addAll(sCachedFilteredList);
             contactAdapter.notifyDataSetChanged();
-            recyclerView.setVisibility(View.VISIBLE);
         }
     }
+
+    private void filterContacts(String query) {
+        contactList.clear();
+        if (query.isEmpty()) {
+            contactList.addAll(originalContactList);
+        } else {
+            for (ContactModel contact : originalContactList) {
+                if (contact.getName().toLowerCase().contains(query.toLowerCase()) ||
+                    contact.getPinyin().toLowerCase().contains(query.toLowerCase()) ||
+                    contact.getNumber().toLowerCase().contains(query.toLowerCase())) {
+                    contactList.add(contact);
+                }
+            }
+        }
+        contactAdapter.notifyDataSetChanged();
+    }
 }
 

contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java

@@ -1,9 +1,9 @@
 package cc.winboll.studio.contacts.utils;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/08/30 14:32
+ * @Date 2025/03/06 21:08:16
- * @Describe 联系人工具集
+ * @Describe ContactUtils
  */
 import android.content.ContentResolver;
 import android.content.Context;

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

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

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 17 11:39:14 HKT 2025
+#Sun Aug 17 19:23:49 HKT 2025
-stageCount=2
+stageCount=3
 libraryProject=libappbase
 baseVersion=15.9
-publishVersion=15.9.1
+publishVersion=15.9.2
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.9.3