<contacts>APK 15.3.21 release Publish.

.gitignore

@@ -87,19 +87,15 @@ lint/tmp/
 # Android Profiling
 *.hprof
 
-# Custom
-.androidide
+# 忽略 Lint 输出文件
 lint-results.xml
 lint-results.html
-winboll.properties
-local.properties
+
+## 忽略 AndroidIDE 临时文件夹
+.androidide
 
 ## 忽略模块应用编译配置
 /settings.gradle
 /gradle.properties
-
-## 忽略 srv 纠结问题
-/srv/
-
-## 忽略 winboll-x 文件夹
-/winboll-x/
+/winboll.properties
+/local.properties

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 22 06:01:08 HKT 2025
-stageCount=8
+#Fri Sep 26 05:36:14 HKT 2025
+stageCount=9
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.7
+publishVersion=15.10.8
 buildCount=0
-baseBetaVersion=15.10.8
+baseBetaVersion=15.10.9

apputils/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.9" 
+        versionName "15.8" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Sep 21 22:28:28 GMT 2025
-stageCount=0
+#Mon Sep 01 07:56:33 HKT 2025
+stageCount=7
 libraryProject=libapputils
-baseVersion=15.9
-publishVersion=15.9.0
-buildCount=2
-baseBetaVersion=15.9.1
+baseVersion=15.8
+publishVersion=15.8.6
+buildCount=0
+baseBetaVersion=15.8.7

contacts/build.gradle

@@ -18,8 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"
@@ -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'
     

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 06:05:42 CST 2025
-stageCount=17
+#Mon Nov 03 12:01:02 HKT 2025
+stageCount=22
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.16
+publishVersion=15.3.21
 buildCount=0
-baseBetaVersion=15.3.17
+baseBetaVersion=15.3.22

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);
         
     }
 

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

@@ -8,6 +8,7 @@ package cc.winboll.studio.contacts;
 import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -38,8 +39,10 @@ import cc.winboll.studio.contacts.fragments.CallLogFragment;
 import cc.winboll.studio.contacts.fragments.ContactsFragment;
 import cc.winboll.studio.contacts.fragments.LogFragment;
 import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.contacts.utils.AppGoToSettingsUtil;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
@@ -48,10 +51,9 @@ 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 int REQUEST_HOME_ACTIVITY = 0;
     public static final int REQUEST_ABOUT_ACTIVITY = 1;
-
+    public static final int REQUEST_APP_SETTINGS = 2;
     public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS";
 
     static MainActivity _MainActivity;
@@ -72,6 +74,13 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
     List<String> tabTitleList;
 
     private static final int DIALER_REQUEST_CODE = 1;
+    private static final int REQUEST_REQUIRED_PERMISSIONS = 1002;
+    // 关键修改1：新增 READ_CALL_LOG 权限到必需权限列表（解决通话记录读取崩溃）
+    private String[] REQUIRED_PERMISSIONS = new String[]{
+		Manifest.permission.READ_CONTACTS,  // 通讯录读取（原）
+		Manifest.permission.CALL_PHONE,     // 电话拨号（原）
+		Manifest.permission.READ_CALL_LOG   // 通话记录读取（新增，核心修复）
+    };
 
 
     @Override
@@ -88,9 +97,88 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         _MainActivity = this;
+
+        // 优先检查所有必需权限（含新增的 READ_CALL_LOG）
+        if (!checkAllRequiredPermissions()) {
+            requestAllRequiredPermissions();
+        } else {
+            initUIAndLogic(savedInstanceState);
+        }
+		
+		//ToastUtils.show("onCreate");
+    }
+
+    // 权限检查方法（无需修改，自动包含新增的 READ_CALL_LOG）
+    private boolean checkAllRequiredPermissions() {
+        for (String permission : REQUIRED_PERMISSIONS) {
+            if (ActivityCompat.checkSelfPermission(this, permission) 
+				!= PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // 权限申请方法（无需修改，自动申请新增的 READ_CALL_LOG）
+    private void requestAllRequiredPermissions() {
+        ActivityCompat.requestPermissions(this, REQUIRED_PERMISSIONS, REQUEST_REQUIRED_PERMISSIONS);
+    }
+
+    // 权限结果回调（无需修改，确保所有权限（含 READ_CALL_LOG）都通过才加载UI）
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == REQUEST_REQUIRED_PERMISSIONS) {
+            boolean allPermissionsGranted = true;
+            for (int result : grantResults) {
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    allPermissionsGranted = false;
+                    break;
+                }
+            }
+
+            if (allPermissionsGranted) {
+                initUIAndLogic(null);
+            } else {
+                // 关键修改2：更新提示文案，告知用户新增的“通话记录权限”
+                showPermissionDeniedDialogAndExit();
+            }
+        }
+    }
+
+    // 核心修改：新增“设置权限”按钮，点击调用 AppGoToSettingsUtil 跳转设置页
+    private void showPermissionDeniedDialogAndExit() {
+        new AlertDialog.Builder(this)
+			.setTitle("权限不足，无法使用")
+			// 文案修改：明确新增“通话记录读取”权限
+			.setMessage("应用需要「通讯录读取」、「电话」和「通话记录读取」权限才能正常运行，请授予权限后重新打开应用。")
+			.setCancelable(false)
+			// 新增：左侧“设置权限”按钮（先添加的按钮在左侧）
+			.setNegativeButton("设置权限", new AlertDialog.OnClickListener() {
+				@Override
+				public void onClick(android.content.DialogInterface dialog, int which) {
+					dialog.dismiss();
+					// 调用工具类跳转应用设置页（按需求实现）
+					AppGoToSettingsUtil appGoToSettingsUtil = new AppGoToSettingsUtil();
+					appGoToSettingsUtil.GoToSetting(MainActivity.this);
+				}
+			})
+			// 原有：右侧“确定退出”按钮（后添加的按钮在右侧）
+			.setPositiveButton("确定退出", new AlertDialog.OnClickListener() {
+				@Override
+				public void onClick(android.content.DialogInterface dialog, int which) {
+					dialog.dismiss();
+					finishAndRemoveTask();
+				}
+			})
+			.show();
+    }
+
+    // 初始化UI和逻辑（无需修改，权限通过后才加载 CallLogFragment）
+    private void initUIAndLogic(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
-        // 初始化工具栏（仅加载基础UI）
         mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
         getSupportActionBar().setSubtitle(TAG);
@@ -98,34 +186,28 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         tabLayout = (TabLayout) findViewById(R.id.tabLayout);
         viewPager = (ViewPager) findViewById(R.id.viewPager);
 
-        // 创建Fragment列表（仅实例化，不加载数据）
         fragmentList = new ArrayList<Fragment>();
         tabTitleList = new ArrayList<String>();
+        // CallLogFragment 仅在权限通过后才实例化（避免提前触发读取）
         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适配器
         MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
         viewPager.setAdapter(adapter);
-
-        // 关键：关闭预加载，仅当前页初始化
-        viewPager.setOffscreenPageLimit(0);
-
-        // 关联TabLayout和ViewPager
+        viewPager.setOffscreenPageLimit(0); // 关闭预加载，避免提前初始化 CallLogFragment
         tabLayout.setupWithViewPager(viewPager);
 
-        // 初始化服务状态（延迟启动非核心服务）
+        // 原有服务启动、电话监听等逻辑...
         MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
         if (mMainServiceBean == null) {
             mMainServiceBean = new MainServiceBean();
             MainServiceBean.saveBean(this, mMainServiceBean);
         }
         if (mMainServiceBean.isEnable()) {
-            // 延迟1秒启动服务，避免阻塞启动
             new Handler().postDelayed(new Runnable() {
 					@Override
 					public void run() {
@@ -134,16 +216,14 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
 				}, 1000);
         }
 
-        // 初始化电话状态监听（基础功能保留）
         telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
         phoneStateListener = new MyPhoneStateListener();
         telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
     }
 
 
-    // ViewPager适配器（Java 7语法）
+    // 以下为原有代码（无需修改）
     private class MyPagerAdapter extends FragmentPagerAdapter {
-
         private List<Fragment> fragmentList;
         private List<String> tabTitleList;
 
@@ -173,21 +253,18 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         Intent intent = new Intent(Intent.ACTION_DIAL);
         intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
         if (ActivityCompat.checkSelfPermission(_MainActivity, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(_MainActivity, "拨号权限不足", Toast.LENGTH_SHORT).show();
             return;
         }
         _MainActivity.startActivity(intent);
     }
 
-    // OnPageChangeListener接口实现
     @Override
     public void onPageScrollStateChanged(int state) {}
-
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
-
     @Override
     public void onPageSelected(int position) {}
-
     @Override
     public void onClick(View v) {}
 
@@ -239,9 +316,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         super.onResume();
     }
 
-    /**
-     * 检查是否是系统默认电话应用
-     */
     public boolean isDefaultPhoneCallApp() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             TelecomManager manger = (TelecomManager) getSystemService(TELECOM_SERVICE);
@@ -272,7 +346,9 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
                 Toast.makeText(MainActivity.this, getString(R.string.app_name) + " 已成为默认电话应用",
 							   Toast.LENGTH_SHORT).show();
             }
-        }
+        } else if (requestCode == REQUEST_APP_SETTINGS) {
+			recreate();
+		}
     }
 }
 

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;
 
@@ -263,7 +263,7 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
                 @Override
                 public void run() {
                     if (tomCat.downloadBoBullToon()) {
-                        ToastUtils.show("BoBullToon downlaod OK!");
+						LogUtils.d(TAG, "BoBullToon downlaod OK!");
                         MainService.restartMainService(SettingsActivity.this);
                         Rules.getInstance(SettingsActivity.this).reload();
                     }

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;
@@ -76,6 +76,9 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
 									// Set the clipboard's primary clip.
 									clipboard.setPrimaryClip(clip);
 									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+								} else if (nItemId == R.id.item_calllog_phonenumber_add_contact) {
+									//ToastUtils.show(callLog.getPhoneNumber());
+									ContactUtils.jumpToAddContact(mContext, callLog.getPhoneNumber());
 								}
 
 								return true;

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

@@ -21,8 +21,9 @@ 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.contacts.utils.ContactUtils;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.List;
 
 public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
@@ -69,6 +70,11 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
 									// Set the clipboard's primary clip.
 									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());
+									//ToastUtils.show(String.format("%d", nContactId));
+									ContactUtils.jumpToEditContact(mContext, contact.getNumber(), nContactId);
 								}
 
 								return true;
@@ -112,7 +118,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
         TextView contactName;
         TextView contactNumber;
         AOHPCTCSeekBar dialAOHPCTCSeekBar;
-        
+
         public ContactViewHolder(@NonNull View itemView) {
             super(itemView);
 			llPhoneNumberMain = itemView.findViewById(R.id.itemcontactLinearLayout1);

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;
 

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;

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

@@ -25,7 +25,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.CallLogAdapter;
 import cc.winboll.studio.contacts.beans.CallLogModel;
-import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -161,7 +160,7 @@ public class CallLogFragment extends Fragment {
             _CallLogFragment.triggerUpdate();
         }
     }
-	
+
 	@Override
 	public void onResume() {
 		super.onResume();

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;
@@ -95,7 +95,7 @@ public class ContactsFragment extends Fragment {
         recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         contactList = new ArrayList<ContactModel>();
-        contactAdapter = new ContactAdapter(getContext(), contactList);
+        contactAdapter = new ContactAdapter(getActivity(), contactList);
         recyclerView.setAdapter(contactAdapter);
         // 初始隐藏列表，数据加载后显示
         recyclerView.setVisibility(View.GONE);

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 {
 

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 {

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

@@ -0,0 +1,270 @@
+package cc.winboll.studio.contacts.utils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/27 14:27
+ * @Describe 调用应用属性设置页工具类
+ *  来源：https://blog.csdn.net/zhuhai__yizhi/article/details/78737593
+ *  Created by zyy on 2018/3/12.
+ *  直接跳转到权限后返回，可以监控权限授权情况，但是，跳转到应用详情页，无法监测权限情况
+ *  是否要加以区分，若是应用详情页，则跳转回来后，onRestart检测所求权限，如果授权，则收回提示，如果没授权，则继续提示
+ */
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+import cc.winboll.studio.contacts.MainActivity;
+
+public class AppGoToSettingsUtil {
+
+    public static final String TAG = "AppGoToSettingsUtil";
+
+    public static final int ACTIVITY_RESULT_APP_SETTINGS = MainActivity.REQUEST_APP_SETTINGS;
+
+    /**
+     * Build.MANUFACTURER判断各大手机厂商品牌
+     */
+    private static final String MANUFACTURER_HUAWEI = "Huawei";//华为
+    private static final String MANUFACTURER_MEIZU = "Meizu";//魅族
+    private static final String MANUFACTURER_XIAOMI = "Xiaomi";//小米
+    private static final String MANUFACTURER_SONY = "Sony";//索尼
+    private static final String MANUFACTURER_OPPO = "OPPO";
+    private static final String MANUFACTURER_LG = "LG";
+    private static final String MANUFACTURER_VIVO = "vivo";
+    private static final String MANUFACTURER_SAMSUNG = "samsung";//三星
+    private static final String MANUFACTURER_LETV = "Letv";//乐视
+    private static final String MANUFACTURER_ZTE = "ZTE";//中兴
+    private static final String MANUFACTURER_YULONG = "YuLong";//酷派
+    private static final String MANUFACTURER_LENOVO = "LENOVO";//联想
+
+    public static boolean isAppSettingOpen=false;
+    /**
+     * 跳转到相应品牌手机系统权限设置页，如果跳转不成功，则跳转到应用详情页
+     * 这里需要改造成返回true或者false，应用详情页:true，应用权限页:false
+     * @param activity
+     */
+    public static void GoToSetting(Activity activity) {
+        switch (Build.MANUFACTURER) {
+            case MANUFACTURER_HUAWEI://华为
+                Huawei(activity);
+                break;
+            case MANUFACTURER_MEIZU://魅族
+                Meizu(activity);
+                break;
+            case MANUFACTURER_XIAOMI://小米
+                Xiaomi(activity);
+                break;
+            case MANUFACTURER_SONY://索尼
+                Sony(activity);
+                break;
+            case MANUFACTURER_OPPO://oppo
+                OPPO(activity);
+                break;
+            case MANUFACTURER_LG://lg
+                LG(activity);
+                break;
+            case MANUFACTURER_LETV://乐视
+                Letv(activity);
+                break;
+            default://其他
+                try {//防止应用详情页也找不到，捕获异常后跳转到设置，这里跳转最好是两级，太多用户也会觉得麻烦，还不如不跳
+                    openAppDetailSetting(activity);
+                    //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+                } catch (Exception e) {
+                    SystemConfig(activity);
+                }
+                break;
+        }
+    }
+
+    /**
+     * 华为跳转权限设置页
+     * @param activity
+     */
+    public static void Huawei(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.huawei.systemmanager", "com.huawei.permissionmanager.ui.MainActivity");
+            intent.setComponent(comp);
+            activity.startActivityForResult(intent, ACTIVITY_RESULT_APP_SETTINGS);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 魅族跳转权限设置页，测试时，点击无反应，具体原因不明
+     * @param activity
+     */
+    public static void Meizu(Activity activity) {
+        try {
+            Intent intent = new Intent("com.meizu.safe.security.SHOW_APPSEC");
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
+            intent.putExtra("packageName", activity.getPackageName());
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 小米，功能正常
+     * @param activity
+     */
+    public static void Xiaomi(Activity activity) {
+        try { //MIUI 8 9
+            Intent localIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            localIntent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity");
+            localIntent.putExtra("extra_pkgname", activity.getPackageName());
+            activity.startActivityForResult(localIntent, ACTIVITY_RESULT_APP_SETTINGS);
+            isAppSettingOpen = false;
+            //activity.startActivity(localIntent);
+        } catch (Exception e) {
+            try { //MIUI 5/6/7
+                Intent localIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+                localIntent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+                localIntent.putExtra("extra_pkgname", activity.getPackageName());
+                activity.startActivityForResult(localIntent, ACTIVITY_RESULT_APP_SETTINGS);
+                isAppSettingOpen = false;
+                //activity.startActivity(localIntent);
+            } catch (Exception e1) { //否则跳转到应用详情
+                openAppDetailSetting(activity);
+                //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+                //这里有个问题，进入活动后需要再跳一级活动，就检测不到返回结果
+                //activity.startActivity(getAppDetailSettingIntent());
+            }
+        }
+    }
+
+    /**
+     * 索尼，6.0以上的手机非常少，基本没看见
+     * @param activity
+     */
+    public static void Sony(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.sonymobile.cta", "com.sonymobile.cta.SomcCTAMainActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * OPPO
+     * @param activity
+     */
+    public static void OPPO(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.color.safecenter", "com.color.safecenter.permission.PermissionManagerActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * LG经过测试，正常使用
+     * @param activity
+     */
+    public static void LG(Activity activity) {
+        try {
+            Intent intent = new Intent("android.intent.action.MAIN");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.android.settings", "com.android.settings.Settings$AccessLockSummaryActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 乐视6.0以上很少，基本都可以忽略了，现在乐视手机不多
+     * @param activity
+     */
+    public static void Letv(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.letv.android.letvsafe", "com.letv.android.letvsafe.PermissionAndApps");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 只能打开到自带安全软件
+     * @param activity
+     */
+    public static void _360(Activity activity) {
+        try {
+            Intent intent = new Intent("android.intent.action.MAIN");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.qihoo360.mobilesafe", "com.qihoo360.mobilesafe.ui.index.AppEnterActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+    /**
+     * 系统设置界面
+     * @param activity
+     */
+    public static void SystemConfig(Activity activity) {
+        Intent intent = new Intent(Settings.ACTION_SETTINGS);
+        activity.startActivity(intent);
+    }
+    /**
+     * 获取应用详情页面
+     * @return
+     */
+    private static Intent getAppDetailSettingIntent(Activity activity) {
+        Intent localIntent = new Intent();
+        localIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        //if (Build.VERSION.SDK_INT >= 9) {
+        localIntent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS");
+        localIntent.setData(Uri.fromParts("package", activity.getPackageName(), null));
+        /*} else if (Build.VERSION.SDK_INT <= 8) {
+         localIntent.setAction(Intent.ACTION_VIEW);
+         localIntent.setClassName("com.android.settings", "com.android.settings.InstalledAppDetails");
+         localIntent.putExtra("com.android.settings.ApplicationPkgName", activity.getPackageName());
+         }*/
+        return localIntent;
+    }
+
+    public static void openAppDetailSetting(Activity activity) {
+        activity.startActivityForResult(getAppDetailSettingIntent(activity), ACTIVITY_RESULT_APP_SETTINGS);
+        isAppSettingOpen = true;
+    }
+}

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

@@ -6,10 +6,14 @@ package cc.winboll.studio.contacts.utils;
  * @Describe 联系人工具集
  */
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
+import android.net.Uri;
 import android.provider.ContactsContract;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -120,4 +124,92 @@ public class ContactUtils {
         }
         return sbSpaceNumber.toString();
     }
+
+
+	/**
+	 * 跳转至系统添加联系人界面的工具函数
+	 * @param context 上下文（如 PhoneCallService、Activity、Fragment 均可，需传入有效上下文）
+	 * @param phoneNumber 可选参数：预填的联系人电话（传 null 则跳转空表单）
+	 */
+	public static void jumpToAddContact(Context mContext, String phoneNumber) {
+		Intent intent = new Intent(Intent.ACTION_INSERT);
+		intent.setType("vnd.android.cursor.dir/person");
+		intent.putExtra(android.provider.ContactsContract.Intents.Insert.PHONE, phoneNumber);
+		mContext.startActivity(intent);
+	}
+
+	/**
+	 * 跳转至系统编辑联系人界面（适配小米等定制机型）
+	 * @param context 上下文（Activity/Service/Fragment）
+	 * @param phoneNumber 待编辑联系人的电话号码（用于匹配已有联系人，必传）
+	 * @param contactId 可选：已有联系人的ID（通过 ContactsContract 获取，传null则自动匹配号码）
+	 */
+	public static void jumpToEditContact(Context context, String phoneNumber, Long contactId) {
+		Intent intent = new Intent(Intent.ACTION_EDIT);
+		// 关键：小米等机型需明确设置数据类型为“单个联系人”，避免参数丢失
+		intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+
+		// 场景A：已知联系人ID（精准定位，优先用此方式，参数传递最稳定）
+		if (contactId != null && contactId > 0) {
+			// 构建联系人的Uri（格式：content://contacts/people/[contactId]，系统标准格式）
+			Uri contactUri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, contactId);
+			intent.setData(contactUri);
+			//ToastUtils.show("1");
+		} else if (phoneNumber != null && !phoneNumber.isEmpty()) {
+			// 方式1：小米等机型兼容的“通过号码定位联系人”参数（部分系统认此参数）
+			//intent.putExtra(ContactsContract.Intents.Insert.PHONE_NUMBER, phoneNumber);
+			// 方式2：补充系统标准的“数据Uri”，强化匹配（避免参数被定制系统忽略）
+			Uri phoneUri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+			intent.setData(phoneUri);
+		} else {
+			LogUtils.d(TAG, "编辑联系人失败：电话号码和联系人ID均为空");
+			return;
+		}
+
+		// 可选：预填最新号码（覆盖原有号码，若用户修改了号码，编辑时自动更新）
+		if (phoneNumber != null && !phoneNumber.isEmpty()) {
+			intent.putExtra(ContactsContract.CommonDataKinds.Phone.NUMBER, phoneNumber);
+			intent.putExtra(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE);
+		}
+
+		// 启动活动（加防护，避免无联系人应用崩溃）
+		// 小米机型在Service/非Activity中调用，需加NEW_TASK标志，否则可能无法启动
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		context.startActivity(intent);
+	}
+
+	/**
+	 * 通过电话号码查询联系人ID（适配小米机型，解决编辑时匹配不稳定问题）
+	 * @param context 上下文
+	 * @param phoneNumber 待查询的电话号码
+	 * @return 联系人ID（无匹配时返回-1）
+	 */
+	public static Long getContactIdByPhone(Context context, String phoneNumber) {
+		if (phoneNumber == null || phoneNumber.isEmpty()) {
+			return -1L;
+		}
+
+		ContentResolver cr = context.getContentResolver();
+		// 1. 构建电话查询Uri（系统标准：通过号码过滤联系人数据）
+		Uri queryUri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+		// 2. 只查询“联系人ID”字段（高效，避免冗余数据）
+		String[] projection = {ContactsContract.CommonDataKinds.Phone.CONTACT_ID};
+		Cursor cursor = null;
+
+		try {
+			cursor = cr.query(queryUri, projection, null, null, null);
+			if (cursor != null && cursor.moveToFirst()) {
+				// 3. 读取联系人ID（返回Long类型，避免int溢出）
+				return cursor.getLong(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.CONTACT_ID));
+			}
+		} catch (Exception e) {
+			LogUtils.d(TAG, "查询联系人ID失败。" + e);
+		} finally {
+			if (cursor != null) {
+				cursor.close(); // 关闭游标，避免内存泄漏
+			}
+		}
+		return -1L; // 无匹配联系人
+	}
+
 }

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 {
 

contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml

@@ -5,5 +5,8 @@
     <item
         android:id="@+id/item_calllog_phonenumber_copy"
         android:title="Copy"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_add_contact"
+        android:title="Add Contact"/>
     
 </menu>

contacts/src/main/res/menu/toolbar_contact_phonenumber.xml

@@ -5,5 +5,8 @@
     <item
         android:id="@+id/item_contact_phonenumber_copy"
         android:title="Copy"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_edit_contact"
+        android:title="Edit Contact"/>
     
 </menu>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 22 02:57:06 HKT 2025
-stageCount=8
+#Fri Sep 26 05:36:14 HKT 2025
+stageCount=9
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.7
+publishVersion=15.10.8
 buildCount=0
-baseBetaVersion=15.10.8
+baseBetaVersion=15.10.9

libapputils/build.gradle

@@ -32,8 +32,6 @@ dependencies {
     
     // Html 解析
     api 'org.jsoup:jsoup:1.13.1'
-	
-	api 'com.google.code.gson:gson:2.10.1'
     
     // SSH
     //api 'com.jcraft:jsch:0.1.55'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Sep 21 22:28:28 GMT 2025
-stageCount=0
+#Mon Sep 01 07:56:11 HKT 2025
+stageCount=7
 libraryProject=libapputils
-baseVersion=15.9
-publishVersion=15.9.0
-buildCount=2
-baseBetaVersion=15.9.1
+baseVersion=15.8
+publishVersion=15.8.6
+buildCount=0
+baseBetaVersion=15.8.7

libapputils/src/main/java/cc/winboll/studio/libapputils/utils/AppUtils.java

@@ -1,29 +0,0 @@
-package cc.winboll.studio.libapputils.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/02/15 20:05:03
- * @Describe AppUtils
- */
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class AppUtils {
-    
-    public static final String TAG = "AppUtils";
-    
-    public static String getAppNameByPackageName(Context context, String packageName) {
-        PackageManager packageManager = context.getPackageManager();
-        try {
-            ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
-            return (String) packageManager.getApplicationLabel(applicationInfo);
-        } catch (NameNotFoundException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            return "";
-        }
-    }
-}
-

libapputils/src/main/java/cc/winboll/studio/libapputils/utils/FileUtils.java

@@ -9,16 +9,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.AssetManager;
 import android.net.Uri;
-import android.support.v4.content.FileProvider;
 import cc.winboll.studio.libappbase.LogUtils;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -28,6 +22,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import android.support.v4.content.FileProvider;
 
 public class FileUtils {
 
@@ -102,6 +97,36 @@ public class FileUtils {
         }
     }
 
+    //
+    // 把字符串写入文件，指定 UTF-8 编码
+    //
+    public static void writeStringToFile(String szFilePath, String szContent) throws IOException {
+        File file = new File(szFilePath);
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        FileOutputStream outputStream = new FileOutputStream(file);
+        OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);
+        writer.write(szContent);
+        writer.close();
+    }
+
+    //
+    // 读取文件到字符串，指定 UTF-8 编码
+    //
+    public static String readStringFromFile(String szFilePath) throws IOException {
+        File file = new File(szFilePath);
+        FileInputStream inputStream = new FileInputStream(file);
+        InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+        StringBuilder content = new StringBuilder();
+        int character;
+        while ((character = reader.read()) != -1) {
+            content.append((char) character);
+        }
+        reader.close();
+        return content.toString();
+    }
+
     public static boolean copyFile(File srcFile, File dstFile) {
         if (!srcFile.exists()) {
             LogUtils.d(TAG, "The original file does not exist.");
@@ -129,113 +154,4 @@ public class FileUtils {
         }
         return false;
     }
-	
-
-    /**
-     * 读取文件为字节数组（Java 7 语法）
-     */
-    public static byte[] readByteArrayFromFile(String filePath) {
-        FileInputStream fis = null;
-        ByteArrayOutputStream bos = null;
-        try {
-            fis = new FileInputStream(filePath);
-            bos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[4096];
-            int bytesRead;
-            while ((bytesRead = fis.read(buffer)) != -1) {
-                bos.write(buffer, 0, bytesRead);
-            }
-            return bos.toByteArray();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        } finally {
-            // 手动关闭流（Java 7 不支持 try-with-resources）
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (bos != null) {
-                try {
-                    bos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    /**
-     * 写入字节数组到文件（Java 7 语法）
-     */
-    public static boolean writeByteArrayToFile(byte[] data, String filePath) {
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(filePath);
-            fos.write(data);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static String readStringFromFile(String filePath) {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new FileReader(filePath));
-            StringBuilder content = new StringBuilder();
-            String line;
-            while ((line = reader.readLine()) != null) {
-                content.append(line).append(System.getProperty("line.separator"));
-            }
-            // 去除最后一个换行符（可选）
-            if (content.length() > 0) {
-                content.deleteCharAt(content.length() - 1);
-            }
-            return content.toString();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-	
-    public static boolean writeStringToFile(String content, String filePath, boolean append) {
-        BufferedWriter writer = null;
-        try {
-            writer = new BufferedWriter(new FileWriter(filePath, append));
-            writer.write(content);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
 }

libapputils/src/main/java/cc/winboll/studio/libapputils/utils/RSAUtils.java

@@ -1,222 +0,0 @@
-package cc.winboll.studio.libapputils.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/06/04 13:36
- * @Describe RSA加密工具
- */
-import android.content.Context;
-import android.util.Base64;
-import cc.winboll.studio.libappbase.LogUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Objects;
-import javax.crypto.Cipher;
-
-public class RSAUtils {
-    private static final String TAG = "RSAUtils";
-    private static final int KEY_SIZE = 2048;
-    private static final String KEY_ALGORITHM = "RSA";
-    private static final String PUBLIC_KEY_FILE = "public.key";
-    private static final String PRIVATE_KEY_FILE = "private.key";
-    private static final String CIPHER_ALGORITHM = KEY_ALGORITHM + "/ECB/PKCS1Padding"; // 保留原加密方式
-
-    private final String keyPath;
-    private static volatile RSAUtils INSTANCE;
-
-    /**
-     * 构造方法：初始化密钥存储路径（内部存储）
-     */
-    private RSAUtils(Context context) {
-        keyPath = context.getFilesDir() + File.separator + "keys" + File.separator; // 修正路径格式
-    }
-
-    /**
-     * 获取单例实例
-     */
-    public static synchronized RSAUtils getInstance(Context context) {
-        if (INSTANCE == null) {
-            INSTANCE = new RSAUtils(context);
-        }
-        return INSTANCE;
-    }
-
-    /**
-     * 检查密钥文件是否存在
-     */
-    public boolean keysExist() {
-        File publicKeyFile = new File(keyPath + PUBLIC_KEY_FILE);
-        File privateKeyFile = new File(keyPath + PRIVATE_KEY_FILE);
-        return publicKeyFile.exists() && privateKeyFile.exists();
-    }
-
-    /**
-     * 生成密钥对并保存到文件
-     */
-    public void generateAndSaveKeys() throws Exception {
-        LogUtils.d(TAG, "开始生成 RSA 密钥对（2048位）");
-        KeyPairGenerator generator = KeyPairGenerator.getInstance(KEY_ALGORITHM);
-        generator.initialize(KEY_SIZE);
-        KeyPair keyPair = generator.generateKeyPair();
-
-        saveKey(PUBLIC_KEY_FILE, keyPair.getPublic().getEncoded());
-        saveKey(PRIVATE_KEY_FILE, keyPair.getPrivate().getEncoded());
-        LogUtils.d(TAG, "密钥对生成并保存成功");
-    }
-
-    /**
-     * 获取或生成密钥对（线程安全）
-     */
-    public KeyPair getOrGenerateKeys() throws Exception {
-        if (!keysExist()) {
-            synchronized (RSAUtils.class) { // 双重检查锁，避免多线程重复生成
-                if (!keysExist()) {
-                    generateAndSaveKeys();
-                }
-            }
-        }
-        return readKeysFromFile();
-    }
-
-    /**
-     * 从文件读取密钥对
-     */
-    private KeyPair readKeysFromFile() throws Exception {
-        LogUtils.d(TAG, "读取密钥对文件");
-        try {
-            byte[] publicKeyBytes = readFileToBytes(keyPath + PUBLIC_KEY_FILE);
-            byte[] privateKeyBytes = readFileToBytes(keyPath + PRIVATE_KEY_FILE);
-
-            X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(publicKeyBytes);
-            PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(privateKeyBytes);
-
-            KeyFactory factory = KeyFactory.getInstance(KEY_ALGORITHM);
-            PublicKey publicKey = factory.generatePublic(publicSpec);
-            PrivateKey privateKey = factory.generatePrivate(privateSpec);
-
-            return new KeyPair(publicKey, privateKey);
-        } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
-            LogUtils.e(TAG, "密钥文件读取失败：" + e.getMessage());
-            throw new Exception("密钥文件损坏或格式错误", e);
-        }
-    }
-
-    /**
-     * 保存密钥到文件（通用方法）
-     */
-    private void saveKey(String fileName, byte[] keyBytes) throws IOException {
-        Objects.requireNonNull(keyBytes, "密钥字节数据不可为空");
-        File dir = new File(keyPath);
-        if (!dir.exists() && !dir.mkdirs()) {
-            throw new IOException("创建密钥目录失败：" + keyPath);
-        }
-
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(keyPath + fileName);
-            fos.write(keyBytes);
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     * 读取文件为字节数组（Java 7 兼容）
-     */
-    private byte[] readFileToBytes(String filePath) throws IOException {
-        File file = new File(filePath);
-        if (!file.exists() || file.isDirectory()) {
-            throw new IOException("文件不存在或为目录：" + filePath);
-        }
-
-        FileInputStream fis = null;
-        try {
-            fis = new FileInputStream(file);
-            byte[] data = new byte[(int) file.length()];
-            int bytesRead = fis.read(data);
-            if (bytesRead != data.length) {
-                throw new IOException("文件读取不完整");
-            }
-            return data;
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     * 公钥加密（带参数校验）
-     */
-    public byte[] encryptWithPublicKey(String plainText, PublicKey publicKey) throws Exception {
-        Objects.requireNonNull(plainText, "明文不可为空");
-        Objects.requireNonNull(publicKey, "公钥不可为空");
-
-        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
-        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
-
-        // 检查数据长度是否超过 RSA 限制（2048位密钥最大明文为 214字节，PKCS1Padding）
-        int maxPlainTextSize = cipher.getBlockSize() - 11; // PKCS1Padding 固定填充长度
-        if (plainText.getBytes("UTF-8").length > maxPlainTextSize) {
-            throw new IllegalArgumentException("明文过长，最大支持 " + maxPlainTextSize + " 字节");
-        }
-
-        return cipher.doFinal(plainText.getBytes("UTF-8"));
-    }
-
-    /**
-     * 私钥解密（带参数校验）
-     */
-    public String decryptWithPrivateKey(byte[] encryptedData, PrivateKey privateKey) throws Exception {
-        Objects.requireNonNull(encryptedData, "密文不可为空");
-        Objects.requireNonNull(privateKey, "私钥不可为空");
-
-        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
-        cipher.init(Cipher.DECRYPT_MODE, privateKey);
-        byte[] decryptedBytes = cipher.doFinal(encryptedData);
-        return new String(decryptedBytes, "UTF-8");
-    }
-    /**
-     * 将 HTTP 传输的 Base64 字符串还原为加密字节数组（Java 7 兼容）
-     * @param httpString Base64 字符串（非 null）
-     * @return 加密字节数组
-     * @throws IllegalArgumentException 解码失败时抛出
-     */
-    public byte[] httpStringToEncryptBytes(String httpString) {
-        Objects.requireNonNull(httpString, "HTTP 字符串不可为空");
-
-        // 计算缺失的填充符数量（Java 7 不支持 repeat()，手动拼接）
-        int pad = httpString.length() % 4;
-        StringBuilder paddedString = new StringBuilder(httpString);
-        if (pad != 0) {
-            for (int i = 0; i < pad; i++) {
-                paddedString.append('='); // 补全 '='
-            }
-        }
-
-        // 使用 Base64 解码（Android 原生 Base64 类兼容 Java 7）
-        return Base64.decode(paddedString.toString(), Base64.URL_SAFE);
-    }
-}
-

libapputils/src/main/java/cc/winboll/studio/libapputils/utils/YunUtils.java

@@ -1,281 +0,0 @@
-package cc.winboll.studio.libapputils.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/06/04 17:21
- * @Describe 应用登录与接口工具
- */
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.ResponseData;
-import cc.winboll.studio.libappbase.models.UserInfoModel;
-import com.google.gson.Gson;
-import java.io.File;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.concurrent.TimeUnit;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import java.io.UnsupportedEncodingException;
-
-public class YunUtils {
-    public static final String TAG = "YunUtils";
-    // 私有静态实例，类加载时创建
-    private static volatile YunUtils INSTANCE;
-    Context mContext;
-    UserInfoModel mUserInfoModel;
-    String token = "";
-    String mDataFolderPath = "";
-    String mUserInfoModelPath = "";
-
-    private static final int CONNECT_TIMEOUT = 15; // 连接超时时间（秒）
-    private static final int READ_TIMEOUT = 20;    // 读取超时时间（秒）
-    private static volatile YunUtils instance;
-    private OkHttpClient okHttpClient;
-    private Handler mainHandler; // 主线程 Handler
-
-    // 私有构造方法，防止外部实例化
-    private YunUtils(Context context) {
-        LogUtils.d(TAG, "YunUtils");
-        mContext = context;
-        mDataFolderPath = mContext.getExternalFilesDir(TAG).toString();
-        File fTest = new File(mDataFolderPath);
-        if (!fTest.exists()) {
-            fTest.mkdirs();
-        }
-        mUserInfoModelPath = mDataFolderPath + File.separator + "UserInfoModel.rsajson";
-
-        okHttpClient = new OkHttpClient.Builder()
-            .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
-            .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
-            .build();
-        mainHandler = new Handler(Looper.getMainLooper()); // 获取主线程 Looper
-    }
-
-    // 公共静态方法，返回唯一实例
-    public static synchronized YunUtils getInstance(Context context) {
-        LogUtils.d(TAG, "getInstance");
-        if (INSTANCE == null) {
-            INSTANCE = new YunUtils(context);
-        }
-        return INSTANCE;
-    }
-
-    public void checkLoginStatus() {
-        String token = getLocalToken();
-        LogUtils.d(TAG, String.format("checkLoginStatus token is %s", token));
-    }
-
-    String getLocalToken() {
-        UserInfoModel userInfoModel = loadUserInfoModel();
-        return (userInfoModel == null) ?"": userInfoModel.getToken();
-    }
-
-    public void login(String host, UserInfoModel userInfoModel) {
-        LogUtils.d(TAG, "login");
-
-        // 发送 POST 请求
-        String apiUrl = host + "/login/index.php";
-        // 序列化对象为JSON
-        Gson gson = new Gson();
-        String jsonData = gson.toJson(userInfoModel); // 自动生成标准JSON
-        //String jsonData = userInfoModel.toString();
-        LogUtils.d(TAG, "要发送的数据 : " + jsonData);
-
-        sendPostRequest(apiUrl, jsonData, new OnResponseListener() {
-                // 成功回调（主线程）
-                @Override
-                public void onSuccess(String responseBody) {
-                    LogUtils.d(TAG, "onSuccess");
-                    LogUtils.d(TAG, String.format("responseBody %s", responseBody));
-                    Gson gson = new Gson();
-                    ResponseData result = gson.fromJson(responseBody, ResponseData.class); // 转为 Result 实例
-                    if(result.getStatus().equals(ResponseData.STATUS_SUCCESS)) {
-                        
-                            UserInfoModel userInfoModel = result.getData();
-                            if (userInfoModel != null) {
-                                LogUtils.d(TAG, "收到网站 UserInfoModel");
-                                String token = userInfoModel.getToken();
-                                saveLocalToken(token);
-                                checkLoginStatus();
-                            }
-                       
-                    } else if(result.getStatus().equals(ResponseData.STATUS_ERROR)) {
-                        try {
-                            String decodedMessage = URLDecoder.decode(result.getMessage(), "UTF-8");
-                            LogUtils.d(TAG, "服务器返回信息: " + decodedMessage);
-                        } catch (UnsupportedEncodingException e) {
-                            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                        }
-                    }
-                }
-
-                // 失败回调（主线程）
-                @Override
-                public void onFailure(String errorMsg) {
-                    LogUtils.d(TAG, errorMsg);
-                    // 处理错误
-                }
-            });
-    }
-
-    public void saveLocalToken(String token) {
-        UserInfoModel userInfoModel = new UserInfoModel();
-        userInfoModel.setToken(token);
-        saveUserInfoModel(userInfoModel);
-    }
-
-    UserInfoModel loadUserInfoModel() {
-        LogUtils.d(TAG, "loadUserInfoModel");
-        if (new File(mUserInfoModelPath).exists()) {
-            try {
-                // 加载加密后的模型数据
-                byte[] encryptedData = FileUtils.readByteArrayFromFile(mUserInfoModelPath);
-                // 加载 RSA 工具
-                RSAUtils utils = RSAUtils.getInstance(mContext);
-                KeyPair keyPair = utils.getOrGenerateKeys();
-                //PublicKey publicKey = keyPair.getPublic();
-                PrivateKey privateKey = keyPair.getPrivate();
-                // 私钥解密模型数据
-                String szInfo = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
-                LogUtils.d(TAG, String.format("szInfo %s", szInfo));
-                mUserInfoModel = UserInfoModel.parseStringToBean(szInfo, UserInfoModel.class);
-                if (mUserInfoModel == null) {
-                    LogUtils.d(TAG, "模型数据解析为空数据。");
-                }
-                LogUtils.d(TAG, "UserInfoModel 解密加载结束。");
-            } catch (Exception e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            }
-        } else {
-            LogUtils.d(TAG, "云服务登录信息不存在。");
-            mUserInfoModel = null;
-        }
-        return mUserInfoModel;
-    }
-
-    void saveUserInfoModel(UserInfoModel userInfoModel) {
-        LogUtils.d(TAG, "saveUserInfoModel");
-        try {
-            String szInfo = userInfoModel.toString();
-            LogUtils.d(TAG, "原始数据: " + szInfo);
-
-            RSAUtils utils = RSAUtils.getInstance(mContext);
-            KeyPair keyPair = utils.getOrGenerateKeys();
-            PublicKey publicKey = keyPair.getPublic();
-
-            // 公钥加密（传入字节数组，避免中间字符串转换）
-            byte[] encryptedData = utils.encryptWithPublicKey(szInfo, publicKey);
-
-            // 保存加密字节数组到文件（直接操作字节，无需转字符串）
-            FileUtils.writeByteArrayToFile(encryptedData, mUserInfoModelPath);
-            LogUtils.d(TAG, "加密数据已保存");
-
-            // 测试解密（仅调试用）
-            String szInfo2 = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
-            LogUtils.d(TAG, "解密结果: " + szInfo2);
-
-            mUserInfoModel = UserInfoModel.parseStringToBean(szInfo2, UserInfoModel.class);
-            if (mUserInfoModel == null) {
-                LogUtils.d(TAG, "模型解析失败");
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, "加密/解密失败: " + e.getMessage());
-        }
-    }
-
-    // 发送 POST 请求（JSON 数据）
-    public void sendPostRequest(String url, String data, OnResponseListener listener) {
-        RequestBody requestBody = RequestBody.create(
-            MediaType.parse("application/json; charset=utf-8"), // 关键头信息
-            data.getBytes(StandardCharsets.UTF_8)
-        );
-
-        Request request = new Request.Builder()
-            .url(url)
-            .post(requestBody)
-            .addHeader("Content-Type", "application/json") // 显式添加头
-            .build();
-
-        executeRequest(request, listener);
-    }
-
-    // 发送 GET 请求
-    public void sendGetRequest(String url, OnResponseListener listener) {
-        Request request = new Request.Builder()
-            .url(url)
-            .get()
-            .build();
-        executeRequest(request, listener);
-    }
-
-    // 执行请求（子线程处理）
-    private void executeRequest(final Request request, final OnResponseListener listener) {
-        okHttpClient.newCall(request).enqueue(new Callback() {
-                // 响应成功（子线程）
-                @Override
-                public void onResponse(Call call, Response response) throws IOException {
-                    try {
-                        if (!response.isSuccessful()) {
-                            postFailure(listener, "响应码错误：" + response.code());
-                            return;
-                        }
-                        String responseBody = response.body().string();
-                        postSuccess(listener, responseBody);
-                    } catch (Exception e) {
-                        postFailure(listener, "解析失败：" + e.getMessage());
-                    }
-                }
-
-                // 响应失败（子线程）
-                @Override
-                public void onFailure(Call call, IOException e) {
-                    postFailure(listener, "网络失败：" + e.getMessage());
-                }
-
-                // 主线程回调（使用 Handler）
-                private void postSuccess(final OnResponseListener listener, final String msg) {
-                    mainHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                listener.onSuccess(msg);
-                            }
-                        });
-                }
-
-                private void postFailure(final OnResponseListener listener, final String msg) {
-                    mainHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                listener.onFailure(msg);
-                            }
-                        });
-                }
-            });
-    }
-
-    public interface OnResponseListener {
-        /**
-         * 成功响应（主线程回调）
-         * @param responseBody 响应体字符串
-         */
-        void onSuccess(String responseBody);
-
-        /**
-         * 失败回调（包含错误信息）
-         * @param errorMsg 错误描述
-         */
-        void onFailure(String errorMsg);
-    }
-}