<powerbell>APK 15.4.5 release Publish.

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Jun 28 12:59:51 HKT 2025
-stageCount=3
+#Thu Jun 19 20:42:40 HKT 2025
+stageCount=2
 libraryProject=libaes
 baseVersion=15.9
-publishVersion=15.9.2
+publishVersion=15.9.1
 buildCount=0
-baseBetaVersion=15.9.3
+baseBetaVersion=15.9.2

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -83,7 +83,7 @@ public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1");
+        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=2&fromuid=1");
         appInfo.setAppAPKName("AES");
         appInfo.setAppAPKFolderName("AES");
         //appInfo.setIsAddDebugTools(false);

appbase/build.gradle

@@ -30,7 +30,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.9"
+        versionName "15.8"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 17 11:39:14 HKT 2025
-stageCount=2
+#Mon Jun 09 09:38:19 HKT 2025
+stageCount=9
 libraryProject=libappbase
-baseVersion=15.9
-publishVersion=15.9.1
+baseVersion=15.8
+publishVersion=15.8.8
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.8.9

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 09:54:47 HKT 2025
-stageCount=3
+#Sun May 04 05:32:00 GMT 2025
+stageCount=1
 libraryProject=
 baseVersion=15.2
-publishVersion=15.2.2
-buildCount=0
-baseBetaVersion=15.2.3
+publishVersion=15.2.0
+buildCount=74
+baseBetaVersion=15.2.1

contacts/README.md

@@ -3,7 +3,7 @@
 https://github.com/aJIEw/PhoneCallApp.git
 
 #### 介绍
-这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。
+通讯录与拨号
 
 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。

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:libapputils:15.8.5'
-    api 'cc.winboll.studio:libappbase:15.9.5'
+    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.1'
     
     // 权限请求框架：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
-stageCount=17
+#Tue May 20 13:02:18 HKT 2025
+stageCount=3
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.16
+publishVersion=15.3.2
 buildCount=0
-baseBetaVersion=15.3.17
+baseBetaVersion=15.3.3

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;
-    int currentPoint = 0;
+    //MyPagerAdapter adapter;//适配器
+    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);
-        viewPager = (ViewPager) findViewById(R.id.viewPager);
+        tabLayout = findViewById(R.id.tabLayout);
+        viewPager = findViewById(R.id.viewPager);
 
-        // 创建Fragment列表（仅实例化，不加载数据）
-        fragmentList = new ArrayList<Fragment>();
-        tabTitleList = new ArrayList<String>();
+        // 创建Fragment列表和标题列表
+        fragmentList = new ArrayList<>();
+        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秒启动服务，避免阻塞启动
-            new Handler().postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						MainService.startMainService(MainActivity.this);
-					}
-				}, 1000);
+            MainService.startMainService(this);
         }
 
-        // 初始化电话状态监听（基础功能保留）
+        // 初始化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接口实现
-    @Override
-    public void onPageScrollStateChanged(int state) {}
+    //初始化view，即显示的图片
+//    void initView() {
+//        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
-    public void onPageSelected(int position) {}
+//    void initPoint() {
+//        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/activities/AboutActivity.java

@@ -79,12 +79,12 @@ public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity
         APPInfo appInfo = new APPInfo();
         appInfo.setAppName("Contacts");
         appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
-        appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。");
-        appInfo.setAppGitName("APPBase");
+        appInfo.setAppDescription("通讯录与拨号");
+        appInfo.setAppGitName("APP");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=4&extra=page%3D1");
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
         appInfo.setAppAPKName("Contacts");
         appInfo.setAppAPKFolderName("Contacts");
         return new AboutView(mContext, appInfo);

contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java

@@ -198,9 +198,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
             settingsModel.setDunTotalCount(Integer.parseInt(etDunTotalCount.getText().toString()));
             settingsModel.setDunResumeSecondCount(Integer.parseInt(etDunResumeSecondCount.getText().toString()));
             settingsModel.setDunResumeCount(Integer.parseInt(etDunResumeCount.getText().toString()));
-			
-			// 应用效果提示
-			ToastUtils.show((settingsModel.getDunTotalCount() == 1)?"电话骚扰防御力几乎为0。":String.format("以下设置将在连拨%d次后接通电话。", settingsModel.getDunTotalCount()));
         }
         settingsModel.setIsEnableDun(isEnableDun);
         Rules.getInstance(this).saveDun();
@@ -210,7 +207,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
         etDunTotalCount.setText(Integer.toString(settingsModel.getDunTotalCount()));
         etDunResumeSecondCount.setText(Integer.toString(settingsModel.getDunResumeSecondCount()));
         etDunResumeCount.setText(Integer.toString(settingsModel.getDunResumeCount()));
-		
     }
 
     void updateStreamVolumeTextView() {
@@ -247,9 +243,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
         Rules.getInstance(this).resetDefaultBoBullToonURL();
         EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
         etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
-		
-		final TomCat tomCat = TomCat.getInstance(this);
-		tomCat.cleanBoBullToon();
     }
 
     public void onDownloadBoBullToon(View view) {
@@ -337,8 +330,4 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
     public void onAbout(View view) {
         App.getWinBoLLActivityManager().startWinBoLLActivity(this, AboutActivity.class);
     }
-	
-	public void onLogView(View view) {
-        App.getWinBoLLActivityManager().startLogActivity(this);
-    }
 }

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

@@ -5,18 +5,13 @@ package cc.winboll.studio.contacts.adapters;
  * @Date 2025/02/26 13:09:32
  * @Describe CallLogAdapter
  */
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.PopupMenu;
 import android.widget.TextView;
-import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
@@ -40,10 +35,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
@@ -56,38 +47,6 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
     public void onBindViewHolder(@NonNull CallLogViewHolder holder, int position) {
         final CallLogModel callLog = callLogList.get(position);
         holder.phoneNumber.setText(callLog.getPhoneNumber() + "☎" + mContactUtils.getContactsName(callLog.getPhoneNumber()));
-		holder.phoneNumber.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View p1) {
-					// 弹出复制菜单
-					PopupMenu menu = new PopupMenu(mContext, holder.phoneNumber);
-					//加载菜单资源
-					menu.getMenuInflater().inflate(R.menu.toolbar_calllog_phonenumber, menu.getMenu());
-					//设置点击事件的响应
-					menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem menuItem) {
-								int nItemId = menuItem.getItemId();
-								if (nItemId == R.id.item_calllog_phonenumber_copy) {
-									// Gets a handle to the clipboard service.
-									ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-									// Creates a new text clip to put on the clipboard
-									ClipData clip = ClipData.newPlainText("simple text", callLog.getPhoneNumber());
-									// Set the clipboard's primary clip.
-									clipboard.setPrimaryClip(clip);
-									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
-								}
-
-								return true;
-							}
-						});
-					//一定要调用show()来显示弹出式菜单
-					menu.show();
-
-					return true;
-				}
-			});
-		
         holder.callStatus.setText(callLog.getCallStatus());
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
         holder.callDate.setText(dateFormat.format(callLog.getCallDate()));

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

@@ -5,25 +5,19 @@ package cc.winboll.studio.contacts.adapters;
  * @Date 2025/02/26 13:35:44
  * @Describe ContactAdapter
  */
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
+import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.ContactModel;
-import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import com.hjq.toast.ToastUtils;
 import java.util.List;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 
 public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
 
@@ -32,10 +26,8 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
     private static final int REQUEST_CALL_PHONE = 1;
 
     private List<ContactModel> contactList;
-	Context mContext;
 
-    public ContactAdapter(Context context, List<ContactModel> contactList) {
-		mContext = context;
+    public ContactAdapter(List<ContactModel> contactList) {
         this.contactList = contactList;
     }
 
@@ -49,37 +41,6 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
     @Override
     public void onBindViewHolder(@NonNull ContactViewHolder holder, int position) {
         final ContactModel contact = contactList.get(position);
-		holder.llPhoneNumberMain.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View p1) {
-					// 弹出复制菜单
-					PopupMenu menu = new PopupMenu(mContext, holder.llPhoneNumberMain);
-					//加载菜单资源
-					menu.getMenuInflater().inflate(R.menu.toolbar_contact_phonenumber, menu.getMenu());
-					//设置点击事件的响应
-					menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem menuItem) {
-								int nItemId = menuItem.getItemId();
-								if (nItemId == R.id.item_contact_phonenumber_copy) {
-									// Gets a handle to the clipboard service.
-									ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-									// Creates a new text clip to put on the clipboard
-									ClipData clip = ClipData.newPlainText("simple text", contact.getNumber());
-									// Set the clipboard's primary clip.
-									clipboard.setPrimaryClip(clip);
-									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
-								}
-
-								return true;
-							}
-						});
-					//一定要调用show()来显示弹出式菜单
-					menu.show();
-
-					return true;
-				}
-			});
         holder.contactName.setText(contact.getName());
         holder.contactNumber.setText(contact.getNumber());
 
@@ -108,14 +69,12 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
     }
 
     public class ContactViewHolder extends RecyclerView.ViewHolder {
-		LinearLayout llPhoneNumberMain;
         TextView contactName;
         TextView contactNumber;
         AOHPCTCSeekBar dialAOHPCTCSeekBar;
         
         public ContactViewHolder(@NonNull View itemView) {
             super(itemView);
-			llPhoneNumberMain = itemView.findViewById(R.id.itemcontactLinearLayout1);
             contactName = itemView.findViewById(R.id.contact_name);
             contactNumber = itemView.findViewById(R.id.contact_number);
             dialAOHPCTCSeekBar = itemView.findViewById(R.id.aohpctcseekbar_dial);

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,7 +20,6 @@ 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 java.util.ArrayList;
@@ -62,10 +60,6 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
             final SimpleViewHolder simpleViewHolder = (SimpleViewHolder) holder;
             String szView = model.getRuleText().trim().equals("") ?"[NULL]": model.getRuleText();
             simpleViewHolder.tvRuleText.setText(szView);
-            simpleViewHolder.checkBoxAllow.setChecked(model.isAllowConnection());
-			simpleViewHolder.checkBoxAllow.setEnabled(false);
-            simpleViewHolder.checkBoxEnable.setChecked(model.isEnable());
-			simpleViewHolder.checkBoxEnable.setEnabled(false);
             simpleViewHolder.scrollView.setOnActionListener(new LeftScrollView.OnActionListener(){
 
                     @Override
@@ -221,22 +215,16 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
 
         private final LeftScrollView scrollView;
         private final TextView tvRuleText;
-		CheckBox checkBoxAllow;
-        CheckBox checkBoxEnable;
 
 
         public SimpleViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
             super(itemView);
             scrollView = itemView.findViewById(R.id.scrollView);
-			LayoutInflater inflater = LayoutInflater.from(itemView.getContext());
-		    View viewContent = inflater.inflate(R.layout.view_phone_connect_rule_simple_content, parent, false);
-            tvRuleText = viewContent.findViewById(R.id.ruletext_tv);
-            checkBoxAllow = viewContent.findViewById(R.id.checkbox_allow);
-            checkBoxEnable = viewContent.findViewById(R.id.checkbox_enable);
-            //tvRuleText = new TextView(itemView.getContext());
+            //tvRuleText = itemView.findViewById(R.id.ruletext_tv);
+            tvRuleText = new TextView(itemView.getContext());
             scrollView.setContentWidth(parent.getWidth());
             //scrollView.setContentWidth(600);
-            scrollView.addContentLayout(viewContent);
+            scrollView.addContentLayout(tvRuleText);
         }
 
     }
@@ -255,9 +243,5 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
             buttonConfirm = itemView.findViewById(R.id.button_confirm);
         }
     }
-
-	private void setCheckBoxTouchListener(CheckBox checkBox) {
-
-	}
 }
 

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>
- * @Date 2025/08/30 14:32
- * @Describe 联系人信息数据模型
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/26 13:37:00
+ * @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) {
-                        pinyin.append(pinyinArray[0]); // 取第一个拼音（多音字默认首选项）
+                    if (pinyinArray != null) {
+                        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;
@@ -45,7 +44,7 @@ public class TomCat {
         }
         return _TomCat;
     }
-
+    
     public String getDefaultBobulltoonUrl() {
         return mContext.getString(R.string.default_bobulltoon_url);
     }
@@ -124,7 +123,7 @@ public class TomCat {
             }
 
             // 更新新文件
-            if (downloadAndExtractZip(zipUrl, destinationFolder)) {
+            if(downloadAndExtractZip(zipUrl, destinationFolder)) {
                 LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
                 return true;
             }
@@ -155,81 +154,12 @@ 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(); // 替换为实际的目标文件夹路径
-		// 删除旧文件
-		File fOldFolder = new File(destinationFolder);
-		if (fOldFolder.exists()) {
-			deleteFolderRecursive(fOldFolder);
-			fOldFolder.mkdirs();
-		}
-
-		ToastUtils.show("已清空 BoBullToon 数据!");
-		LogUtils.d(TAG, "已清空 BoBullToon 数据");
-	}
 
     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/dun/Rules.java

@@ -145,14 +145,6 @@ public class Rules {
             LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
         }
 
-        // 检验拨不通号码群
-        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
-            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
-            isDefend = true;
-            isConnect = false;
-            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-        }
-
         // 查询通讯录是否有该联系人
         boolean isPhoneInContacts = ContactUtils.getInstance(mContext).isPhoneInContacts(mContext, phoneNumber);
         if (!isDefend) {
@@ -166,6 +158,14 @@ public class Rules {
             }
         }
 
+        // 检验拨不通号码群
+        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
+            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
+            isDefend = true;
+            isConnect = false;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
+        }
+
         // 正则匹配规则名单校验
         if (!isDefend) {
             for (int i = 0; i < _PhoneConnectRuleModelList.size(); i++) {

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>
- * @Date 2025/08/30 14:32
- * @Describe 联系人视图
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/20 12:57:50
+ * @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) {
-        // 加载布局（已移除进度条相关代码）
-        View view = inflater.inflate(R.layout.fragment_contacts, container, false);
-        return view;
+        return inflater.inflate(R.layout.fragment_contacts, container, false);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        // 初始化RecyclerView
-        recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view);
+        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(contactList);
         recyclerView.setAdapter(contactAdapter);
-        // 初始隐藏列表，数据加载后显示
-        recyclerView.setVisibility(View.GONE);
 
-        // 绑定搜索框和拨号按钮
-        searchEditText = (EditText) view.findViewById(R.id.search_edit_text);
-        btnDial = (Button) view.findViewById(R.id.btn_dial);
-        // 初始隐藏搜索相关控件，延迟到首次可见时显示
-        searchEditText.setVisibility(View.GONE);
-        btnDial.setVisibility(View.GONE);
-    }
+        searchEditText = view.findViewById(R.id.search_edit_text);
+        searchEditText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
 
-    // 首次可见时初始化资源
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!isViewInitialized) {
-            initSearchAndDial(); // 初始化搜索和拨号功能
-            checkContactPermission(); // 检查权限并加载数据
-            isViewInitialized = true;
-        }
-    }
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    filterContacts(s.toString());
+                }
 
-    // 初始化搜索框和拨号按钮
-    private void initSearchAndDial() {
-        // 显示搜索相关控件
-        searchEditText.setVisibility(View.VISIBLE);
-        btnDial.setVisibility(View.VISIBLE);
+                @Override
+                public void afterTextChanged(Editable s) {
+                }
+            });
 
-        // 搜索框防抖监听
-        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();
-        }
-    }
-
-    // 加载联系人（延迟到首次可见时）
-    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;
+            readContacts();
         }
 
-        // 无缓存时异步加载
-        if (!isDataLoaded) {
-            recyclerView.setVisibility(View.GONE); // 加载中隐藏列表
+        Button btnDial = view.findViewById(R.id.btn_dial);
+        btnDial.setOnClickListener(new View.OnClickListener(){
+                @Override
+                public void onClick(View p1) {
 
-            executor.execute(new Runnable() {
-					@Override
-					public void run() {
-						// 子线程读取联系人
-						final List<ContactModel> tempList = readContactsInBackground();
-
-						// 主线程更新UI
-						mainHandler.post(new Runnable() {
-								@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);
+                    String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
+                    //phoneNumber = "+8616769764848";
+                    ToastUtils.show(phoneNumber);
+                    Intent intent = new Intent(Intent.ACTION_CALL);
+                    intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
+                    // 添加 FLAG_ACTIVITY_NEW_TASK 标志
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
                 }
-            }
-            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(); // 授权后加载联系人
-            } else {
-                ToastUtils.show("请授予联系人权限以查看联系人列表");
-                recyclerView.setVisibility(View.VISIBLE); // 显示空列表
+                readContacts();
             }
         }
     }
 
-    // 防抖TextWatcher（Java 7实现）
-    public abstract static class DebounceTextWatcher implements TextWatcher {
-        private final long debounceDelay;
-        private Handler handler = new Handler(Looper.getMainLooper());
-        private Runnable pendingRunnable;
+    private void readContacts() {
+        contactList.clear();
+        originalContactList.clear();
+        Cursor cursor = requireContext().getContentResolver().query(
+            ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+            null,
+            null,
+            null,
+            ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC");
 
-        public DebounceTextWatcher(long debounceDelay) {
-            this.debounceDelay = debounceDelay;
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            // 无需处理
-        }
-
-        @Override
-        public void onTextChanged(final CharSequence s, int start, int before, int count) {
-            // 移除之前的延迟任务
-            if (pendingRunnable != null) {
-                handler.removeCallbacks(pendingRunnable);
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                String name = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+                String number = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
+                ContactModel contact = new ContactModel(name, number);
+                contactList.add(contact);
+                originalContactList.add(contact);
             }
-            // 延迟执行过滤
-            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);
+            cursor.close();
             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>
- * @Date 2025/08/30 14:32
- * @Describe 联系人工具集
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/06 21:08:16
+ * @Describe ContactUtils
  */
 import android.content.ContentResolver;
 import android.content.Context;

contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java

@@ -47,8 +47,8 @@ public class LeftScrollView extends HorizontalScrollView {
         init();
     }
 
-    public void addContentLayout(View viewContent) {
-        contentLayout.addView(viewContent, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+    public void addContentLayout(TextView textView) {
+        contentLayout.addView(textView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
     }
 
     public void setContentWidth(int contentWidth) {

contacts/src/main/res/layout/activity_settings.xml

@@ -269,19 +269,6 @@
 
 			</LinearLayout>
 
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_horizontal">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="&lt;&lt;==向左拉动列表项可编辑内容"/>
-
-			</LinearLayout>
-
 			<androidx.recyclerview.widget.RecyclerView
 				android:id="@+id/recycler_view"
 				android:layout_width="match_parent"
@@ -300,12 +287,6 @@
 				android:layout_height="wrap_content"
 				android:gravity="right">
 
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="LogView"
-					android:onClick="onLogView"/>
-
 				<Button
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"

contacts/src/main/res/layout/activity_unittest.xml

@@ -15,10 +15,8 @@
 		<Button
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="Add Demo Rules(While size is 0) and Test"
-			android:onClick="onTestMain"
-			android:textSize="10sp"
-			android:textAllCaps="false"/>
+			android:text="Test Main"
+			android:onClick="onTestMain"/>
 
 	</LinearLayout>
 
@@ -45,8 +43,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="Test Phone"
-			android:onClick="onTestPhone"
-			android:textAllCaps="false"/>
+			android:onClick="onTestPhone"/>
 
 	</LinearLayout>
 

contacts/src/main/res/layout/item_contact.xml

@@ -9,8 +9,7 @@
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/itemcontactLinearLayout1">
+		android:layout_height="wrap_content">
 
 		<TextView
 			android:id="@+id/contact_number"

contacts/src/main/res/layout/view_phone_connect_rule.xml

@@ -23,7 +23,7 @@
 			android:id="@+id/checkbox_allow"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="连接"/>
+			android:text="允许连接"/>
 
         <CheckBox
             android:id="@+id/checkbox_enable"

contacts/src/main/res/layout/view_phone_connect_rule_simple2.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HorizontalScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none"
+    android:id="@+id/scrollView">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <!-- 内容区域 -->
+        <LinearLayout
+            android:id="@+id/content_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:background="@color/white">
+            <!-- 这里放置你的列表项内容 -->
+
+            <TextView
+                android:id="@+id/text_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="16sp"/>
+        </LinearLayout>
+
+        <!-- 操作按钮 -->
+        <LinearLayout
+            android:id="@+id/action_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:background="@color/lightgray">
+
+            <Button
+                android:id="@+id/edit_btn"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:text="编辑"
+                android:background="@color/blue" />
+
+            <Button
+                android:id="@+id/delete_btn"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:text="删除"
+                android:background="@color/red" />
+        </LinearLayout>
+    </LinearLayout>
+</HorizontalScrollView>

contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="horizontal"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_gravity="center_vertical"
-	android:gravity="center_vertical">
-
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="Text"
-		android:layout_weight="1.0"
-		android:id="@+id/ruletext_tv"/>
-
-	<CheckBox
-		android:id="@+id/checkbox_allow"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="连接"
-		android:clickable="false"
-		android:focusable="false"/>
-
-	<CheckBox
-		android:id="@+id/checkbox_enable"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="启用"
-		android:clickable="false"
-		android:focusable="false"/>
-
-</LinearLayout>
-

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-    
-    <item
-        android:id="@+id/item_calllog_phonenumber_copy"
-        android:title="Copy"/>
-    
-</menu>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/item_contact_phonenumber_copy"
-        android:title="Copy"/>
-    
-</menu>

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">http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip</string>
 
 </resources>

jc/build.gradle

@@ -42,24 +42,23 @@ android {
         }
     }
     
-    /*compileOptions {
+    compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
-    }*/
+    }
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-	api project(':libjc')
-	api 'cc.winboll.studio:libaes:15.9.1'
-	api 'cc.winboll.studio:libapputils:15.8.4'
-	api 'cc.winboll.studio:libappbase:15.8.4'
-	
     // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
     //implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
     implementation 'org.bouncycastle:bcpkix-jdk15to18:1.69'
 
+	api project(':libjc')
     api 'androidx.appcompat:appcompat:1.0.0'
 	api 'com.google.android.material:material:1.0.0'
+    
+    api 'cc.winboll.studio:libapputils:9.1.0'
+    api 'cc.winboll.studio:libappbase:1.0.3'
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

jc/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 11:17:30 GMT 2025
+#Fri Jan 10 22:03:57 GMT 2025
 stageCount=0
 libraryProject=libjc
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=135
+buildCount=133
 baseBetaVersion=1.0.1

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

@@ -15,10 +15,10 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import cc.winboll.studio.jc.R;
+import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libjc.JAR_RUNNING_MODE;
 import cc.winboll.studio.libjc.JCMainThread;
 import cc.winboll.studio.libjc.net.JCSocketClient;
-import cc.winboll.studio.libjc.util.LogUtils;
-import cc.winboll.studio.libjc.Main;
 
 final public class MainActivity extends Activity implements JCMainThread.OnMessageListener {
 
@@ -77,7 +77,7 @@ final public class MainActivity extends Activity implements JCMainThread.OnMessa
         // 启动主线程
         _JCMainThread = JCMainThread.getInstance(getPackageName());
         _JCMainThread.setOnLogListener(this);
-        //_JCMainThread.setRunningMode(Main.JAR_RUNNING_MODE.JC);
+        _JCMainThread.setRunningMode(JAR_RUNNING_MODE.JC);
         _JCMainThread.start();
 
         // 设置 WinBoll 应用 UI 类型

libaes/build.gradle

@@ -21,8 +21,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libapputils:15.8.4'
-    api 'cc.winboll.studio:libappbase:15.8.4'
+    api 'cc.winboll.studio:libapputils:15.8.2'
+    api 'cc.winboll.studio:libappbase:15.8.2'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Jun 28 12:59:30 HKT 2025
-stageCount=3
+#Thu Jun 19 20:42:26 HKT 2025
+stageCount=2
 libraryProject=libaes
 baseVersion=15.9
-publishVersion=15.9.2
+publishVersion=15.9.1
 buildCount=0
-baseBetaVersion=15.9.3
+baseBetaVersion=15.9.2

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java

@@ -107,7 +107,7 @@ public class AboutView extends LinearLayout {
         mszAppDescription = mAPPInfo.getAppDescription();
         mnAppIcon = mAPPInfo.getAppIcon();
 
-        mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
+        mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://dev.winboll.cc": "https://www.winboll.cc";
 
         try {
             mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 17 11:39:14 HKT 2025
-stageCount=2
+#Mon Jun 09 09:38:19 HKT 2025
+stageCount=9
 libraryProject=libappbase
-baseVersion=15.9
-publishVersion=15.9.1
+baseVersion=15.8
+publishVersion=15.8.8
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.8.9

libjc/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 11:17:30 GMT 2025
+#Fri Jan 10 22:03:57 GMT 2025
 stageCount=0
 libraryProject=libjc
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=135
+buildCount=133
 baseBetaVersion=1.0.1

libjc/src/main/java/cc/winboll/studio/libjc/Main.java

@@ -21,7 +21,7 @@ public class Main {
     public final static int JAR_RUNNING_MODE_JCNDK_DEBUG = 4;
     public final static int JAR_RUNNING_MODE_JC = 5;
     public final static int JAR_RUNNING_MODE_JC_DEBUG = 6;
-    public static enum JAR_RUNNING_MODE {
+    public enum JAR_RUNNING_MODE {
         UNKNOWN(JAR_RUNNING_MODE_UNKNOWN),
         CONSOLE(JAR_RUNNING_MODE_CONSOLE),
         CONSOLE_DEBUG(JAR_RUNNING_MODE_CONSOLE_DEBUG),

mymessagemanager/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.3" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -45,9 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.9.2'
-    api 'cc.winboll.studio:libapputils:15.8.4'
-    api 'cc.winboll.studio:libappbase:15.8.4'
+    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.1'
     
 	api 'io.github.medyo:android-about-page:2.0.0'
     api 'com.github.getActivity:ToastUtils:10.5'

mymessagemanager/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jul 03 13:50:15 HKT 2025
-stageCount=2
+#Tue May 20 20:39:06 HKT 2025
+stageCount=6
 libraryProject=
-baseVersion=15.3
-publishVersion=15.3.1
+baseVersion=15.2
+publishVersion=15.2.5
 buildCount=0
-baseBetaVersion=15.3.2
+baseBetaVersion=15.2.6

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.mymessagemanager.App;
 import cc.winboll.studio.mymessagemanager.R;
 
-public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -79,11 +79,11 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
         appInfo.setAppName(getString(R.string.app_name));
         appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
         appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("APPBase");
+        appInfo.setAppGitName("APP");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=5&extra=page%3D1");
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager");
         appInfo.setAppAPKName("MyMessageManager");
         appInfo.setAppAPKFolderName("MyMessageManager");
         return new AboutView(mContext, appInfo);

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java

@@ -103,9 +103,6 @@ abstract public class BaseActivity extends AppCompatActivity {
         } else if (R.id.item_defaulttheme == item.getItemId()) {
             AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme);
             recreate();
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme);
-            recreate();
         }
         //ToastUtils.show("nThemeStyleID " + Integer.toString(nThemeStyleID));
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java

@@ -128,7 +128,7 @@ public class MainActivity extends BaseActivity {
         mToolbar = findViewById(R.id.activitymainASupportToolbar1);
         mToolbar.setSubtitle(getString(R.string.activity_name_main));
         setSupportActionBar(mToolbar);
-
+        
         boolean isEnableService = mAppConfigUtil.mAppConfigBean.isEnableService();
         msvEnableService = findViewById(R.id.activitymainSwitchView1);
         msvEnableService.setChecked(isEnableService);
@@ -269,9 +269,17 @@ public class MainActivity extends BaseActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         //return super.onCreateOptionsMenu(menu);
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        super.onCreateOptionsMenu(menu);
-		getMenuInflater().inflate(R.menu.toolbar_main2, menu);
-		return true;
+
+        /*ThemeUtil.BaseTheme baseTheme = ThemeUtil.getTheme(mAppConfigUtil.mAppConfigBean.getAppThemeID());
+        if (baseTheme == ThemeUtil.BaseTheme.DEFAULT) {
+            menu.findItem(R.id.app_defaulttheme).setChecked(true);
+        } else if (baseTheme == ThemeUtil.BaseTheme.SKY) {
+            menu.findItem(R.id.app_skytheme).setChecked(true);
+        } else if (baseTheme == ThemeUtil.BaseTheme.GOLDEN) {
+            menu.findItem(R.id.app_goldentheme).setChecked(true);
+        }*/
+
+        return super.onCreateOptionsMenu(menu);
     }
 
     public static void reloadSMS() {
@@ -298,7 +306,7 @@ public class MainActivity extends BaseActivity {
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
 		} else if (nItemId ==  R.id.app_log) {
-            App.getWinBoLLActivityManager().startLogActivity(this);
+            //App.getWinBoLLActivityManager().startLogActivity(this);
         } else if (nItemId ==  R.id.app_unittest) {
             Intent i = new Intent(MainActivity.this, UnitTestActivity.class);
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -316,7 +324,7 @@ public class MainActivity extends BaseActivity {
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
         }
-
+        
         return super.onOptionsItemSelected(item);
     }
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java

@@ -13,9 +13,9 @@ import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity {
 
-    public static final String TAG = "WinBoLLActivity";
+    public static final String TAG = "WinBollActivity";
 
     protected volatile AESThemeBean.ThemeType mThemeType;
 

mymessagemanager/src/main/res/layout/activity_unittest.xml

@@ -34,7 +34,7 @@
 
 	</ScrollView>
 
-	<cc.winboll.studio.libappbase.LogView
+	<cc.winboll.studio.shared.log.LogView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"

mymessagemanager/src/main/res/menu/toolbar_main.xml

@@ -17,4 +17,26 @@
     <item
         android:id="@+id/app_smsrule"
         android:title="@string/text_smsrule"/>
+    <item android:title="@string/app_developoptions">
+        <menu>
+            <item
+                android:id="@+id/app_log"
+                android:title="@string/app_log"/>
+            <item
+                android:id="@+id/app_unittest"
+                android:title="@string/app_unittest"/>
+            <item
+                android:id="@+id/app_crashtest"
+                android:title="@string/app_crashtest"/>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/app_appsettings"
+        android:title="@string/text_appsettings"/>
+    <item
+        android:id="@+id/app_about"
+        android:title="@string/app_about"/>
+    <item
+        android:id="@+id/app_smsrecycle"
+        android:title="@string/app_smsrecycle"/>
 </menu>

mymessagemanager/src/main/res/menu/toolbar_main2.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-	<item android:title="@string/app_developoptions">
-        <menu>
-            <item
-                android:id="@+id/app_log"
-                android:title="@string/app_log"/>
-            <item
-                android:id="@+id/app_unittest"
-                android:title="@string/app_unittest"/>
-            <item
-                android:id="@+id/app_crashtest"
-                android:title="@string/app_crashtest"/>
-        </menu>
-    </item>
-    <item
-        android:id="@+id/app_appsettings"
-        android:title="@string/text_appsettings"/>
-    <item
-        android:id="@+id/app_about"
-        android:title="@string/app_about"/>
-    <item
-        android:id="@+id/app_smsrecycle"
-        android:title="@string/app_smsrecycle"/>
-</menu>

powerbell/build.gradle

@@ -45,9 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.6.0'
-    api 'cc.winboll.studio:libapputils:15.3.4'
-    api 'cc.winboll.studio:libappbase:15.7.6'
+    api 'cc.winboll.studio:libaes:15.9.1'
+    api 'cc.winboll.studio:libapputils:15.8.4'
+    api 'cc.winboll.studio:libappbase:15.8.4'
     
     // 吐司提示库
     api 'com.github.getActivity:ToastUtils:10.5'

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu May 29 09:43:37 HKT 2025
-stageCount=2
+#Mon Jun 23 14:49:46 HKT 2025
+stageCount=6
 libraryProject=
 baseVersion=15.4
-publishVersion=15.4.1
+publishVersion=15.4.5
 buildCount=0
-baseBetaVersion=15.4.2
+baseBetaVersion=15.4.6

powerbell/src/main/AndroidManifest.xml

@@ -121,6 +121,8 @@
 
         <activity android:name="cc.winboll.studio.powerbell.activities.AboutActivity"/>
 
+        <activity android:name="cc.winboll.studio.powerbell.activities.PixelPickerActivity"/>
+
     </application>
 
-</manifest>
+</manifest>

powerbell/src/main/java/cc/winboll/studio/powerbell/App.java

@@ -1,6 +1,7 @@
 package cc.winboll.studio.powerbell;
 
 import android.content.Context;
+import android.os.Environment;
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
@@ -18,7 +19,7 @@ public class App extends GlobalApplication {
     static AppCacheUtils _mAppCacheUtils;
     GlobalApplicationReceiver mReceiver;
     static String szTempDir = "";
-    
+
     public static String getTempDirPath() {
         return szTempDir;
     }
@@ -26,15 +27,24 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+
+        // 临时文件夹方案1
+        // 获取Pictures文件夹路径（Android 10及以上推荐使用MediaStore，此处为传统方式）
+        File picturesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
+        // 定义目标文件路径（在Pictures目录下创建"PowerBell"子文件夹及文件）
+        File powerBellDir = new File(picturesDir, "PowerBell");
         
-        // 初始化临时文件夹目录
-        File fTempDir = new File(getExternalCacheDir(), "TempDir");
-        if(!fTempDir.exists()) {
-            fTempDir.mkdirs();
+        // 临时文件夹方案2 <图片保存失败>
+        // 获取Pictures文件夹路径（Android 10及以上推荐使用MediaStore，此处为传统方式）
+        //File powerBellDir = getExternalFilesDir("TempDir");
+
+        // 先创建文件夹（如果不存在）
+        if (!powerBellDir.exists()) {
+            powerBellDir.mkdirs();
         }
-        szTempDir = fTempDir.getAbsolutePath();
-        
-        
+        szTempDir = powerBellDir.getAbsolutePath();
+
+
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
@@ -45,7 +55,7 @@ public class App extends GlobalApplication {
         // 设置数据配置存储工具
         _mAppConfigUtils = getAppConfigUtils(this);
         _mAppCacheUtils = getAppCacheUtils(this);
-        
+
         mReceiver = new GlobalApplicationReceiver(this);
         mReceiver.registerAction();
     }

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

@@ -10,23 +10,27 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.activities.AboutActivity;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.activities.BatteryReporterActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
+import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
+import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
+import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
+
+public class MainActivity extends WinBoLLActivity {
 
-public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
     public static final int BACKGROUND_PICTURE_REQUEST_CODE = 0;
 
     public static MainActivity _mMainActivity;
-    LogView mLogView;
+    //LogView mLogView;
     //ArrayList<Fragment> mlistFragment;
     App mApplication;
     //AppConfigUtils mAppConfigUtils;
@@ -35,6 +39,16 @@ public class MainActivity extends Activity {
     MainViewFragment mMainViewFragment;
     AToolbar mAToolbar;
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         //LogUtils.d(TAG, "onCreate(...)");
@@ -42,10 +56,10 @@ public class MainActivity extends Activity {
         setContentView(R.layout.activity_main);
 
         // 设置调试日志
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-        //LogUtils.d(TAG, "LogView Start.");
-        mLogView.updateLogView();
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+//        //LogUtils.d(TAG, "LogView Start.");
+//        mLogView.updateLogView();
 
         _mMainActivity = MainActivity.this;
         mApplication = (App) getApplication();
@@ -117,8 +131,8 @@ public class MainActivity extends Activity {
         super.onResume();
         // 回到窗口自动取消提醒消息
         //NotificationHelper.cancelRemindNotification(this);
-
         reloadBackground();
+		setBackgroundColor();
     }
 
     // Menu icons are inflated just as they were with actionbar
@@ -157,6 +171,8 @@ public class MainActivity extends Activity {
             Intent intent = new Intent();
             intent.setClass(this, BackgroundPictureActivity.class);
             startActivity(intent);
+        } else if (menuItemId == R.id.action_log) {
+            App.getWinBoLLActivityManager().startLogActivity(this);
         }
 
         return true;
@@ -193,4 +209,12 @@ public class MainActivity extends Activity {
             moveTaskToBack(true);
         }
     }
+
+	void setBackgroundColor() {
+		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(MainActivity.this);
+		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		int nPixelColor = bean.getPixelColor();
+		RelativeLayout mainLayout = findViewById(R.id.activitymainRelativeLayout1);
+		mainLayout.setBackgroundColor(nPixelColor);
+	}
 } 

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java

@@ -1,22 +1,27 @@
 package cc.winboll.studio.powerbell.activities;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.Toast;
+import android.widget.RelativeLayout;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
 import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
@@ -24,42 +29,45 @@ import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-public class BackgroundPictureActivity extends Activity
-implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
+public class BackgroundPictureActivity extends WinBoLLActivity implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
 
     public static final String TAG = "BackgroundPictureActivity";
-
     public BackgroundPictureUtils mBackgroundPictureUtils;
 
-    // 图片选择请求
+    // 图片选择请求码
     public static final int REQUEST_SELECT_PICTURE = 0;
-    // 照相选择请求
     public static final int REQUEST_TAKE_PHOTO = 1;
-    // 图片裁剪选择请求
     public static final int REQUEST_CROP_IMAGE = 2;
+    private static final int STORAGE_PERMISSION_REQUEST = 100;
 
-    AToolbar mAToolbar;
-    // 所有图片存储的文件夹
-    File mfBackgroundDir;
-    // 拍照与剪裁的文件夹
-    File mfPictureDir;
-    // 拍照文件类
-    File mfTakePhoto;
-    // 接收到的图片文件类
-    public File mfRecivedPicture;
-    // 剪裁文件类
-    File mfTempCropPicture;
-    // 剪裁接收后的文件的文件名
+    private AToolbar mAToolbar;
+    private File mfBackgroundDir;       // 背景图片存储文件夹
+    private File mfPictureDir;          // 拍照与剪裁临时文件夹
+    private File mfTakePhoto;           // 拍照文件
+    private File mfRecivedPicture;      // 接收的图片文件
+    private File mfTempCropPicture;     // 剪裁临时文件
+    private File mfRecivedCropPicture;  // 剪裁后的目标文件
+
+    // 静态变量
     public static String _mszRecivedCropPicture = "RecivedCrop.jpg";
-    File mfRecivedCropPicture;
-    static String _mszCommonFileType = "jpeg";
-    // 背景图片的压缩比
-    int mnPictureCompress = 100;
-    static String _RecivedPictureFileName;
+    private static String _mszCommonFileType = "jpeg";
+    private int mnPictureCompress = 100;
+    private static String _RecivedPictureFileName;
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -67,30 +75,29 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         setContentView(R.layout.activity_backgroundpicture);
         initEnv();
 
+        // 初始化工具类和文件夹
         mBackgroundPictureUtils = BackgroundPictureUtils.getInstance(this);
         mfBackgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
         if (!mfBackgroundDir.exists()) {
             mfBackgroundDir.mkdirs();
         }
-        //mfPictureDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), getString(R.string.app_projectname));
+
         mfPictureDir = new File(App.getTempDirPath());
         if (!mfPictureDir.exists()) {
             mfPictureDir.mkdirs();
         }
+
+        // 初始化文件对象
         mfTakePhoto = new File(mfPictureDir, "TakePhoto.jpg");
         mfTempCropPicture = new File(mfPictureDir, "TempCrop.jpg");
+
         mfRecivedPicture = getRecivedPictureFile(this);
         mfRecivedCropPicture = new File(mfBackgroundDir, _mszRecivedCropPicture);
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
-        //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
         mAToolbar.setSubtitle(R.string.subtitle_activity_backgroundpicture);
-        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
-        //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
-        setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);
         mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
                 @Override
@@ -99,41 +106,30 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
                 }
             });
 
-        //给按钮设置点击事件
+        // 设置按钮点击事件
         findViewById(R.id.activitybackgroundpictureAButton5).setOnClickListener(onOriginNullClickListener);
         findViewById(R.id.activitybackgroundpictureAButton4).setOnClickListener(onReceivedPictureClickListener);
         findViewById(R.id.activitybackgroundpictureAButton1).setOnClickListener(onTakePhotoClickListener);
         findViewById(R.id.activitybackgroundpictureAButton2).setOnClickListener(onSelectPictureClickListener);
         findViewById(R.id.activitybackgroundpictureAButton3).setOnClickListener(onCropPictureClickListener);
         findViewById(R.id.activitybackgroundpictureAButton6).setOnClickListener(onCropFreePictureClickListener);
+		findViewById(R.id.activitybackgroundpictureAButton7).setOnClickListener(onPixelPickerClickListener);
+		findViewById(R.id.activitybackgroundpictureAButton8).setOnClickListener(onCleanPixelClickListener);
 
         updatePreviewBackground();
 
-
-
-        // 判断并且处理应用分享到的文件
-        //
-        //ToastUtils.show("Activity Opened.");
-
-        // 预备接收参数
+        // 处理分享的图片
         Intent intent = getIntent();
         String action = intent.getAction();
         String type = intent.getType();
 
-        //LogUtils.d(TAG, "action : " + action);
-        //LogUtils.d(TAG, "type : " + type);
-
-        // 判断是否进入图片分享状态
-        if (Intent.ACTION_SEND.equals(action)
-            && type != null
-            && ("image/*".equals(type) || "image/jpeg".equals(type) || "image/jpg".equals(type) || "image/png".equals(type) || "image/webp".equals(type))) {
-            // 预览图片
-            BackgroundPicturePreviewDialog dlg= new BackgroundPicturePreviewDialog(this);
+        if (Intent.ACTION_SEND.equals(action) && type != null && isImageType(type)) {
+            BackgroundPicturePreviewDialog dlg = new BackgroundPicturePreviewDialog(this);
             dlg.show();
         }
     }
 
-    void initEnv() {
+    private void initEnv() {
         LogUtils.d(TAG, "initEnv()");
         _RecivedPictureFileName = "Recived.data";
     }
@@ -144,47 +140,55 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
 
     @Override
     public void onAcceptRecivedPicture(String szPreRecivedPictureName) {
-        //ToastUtils.show("onAcceptRecivedPicture");
         BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
         utils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
         utils.saveData();
-        File fPreRecivedPictureName = new File(utils.getBackgroundDir(), szPreRecivedPictureName);
-        FileUtils.copyFile(fPreRecivedPictureName, mfRecivedPicture);
-        // 加载背景
-        startCropImageActivity(false);
-    }
 
-    //
-    // 更新预览背景
-    //
-    public void updatePreviewBackground() {
-        LogUtils.d(TAG, "updatePreviewBackground");
-        ImageView ivPreviewBackground = findViewById(R.id.activitybackgroundpictureImageView1);
-        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
-        utils.loadBackgroundPictureBean();
-        boolean isUseBackgroundFile = utils.getBackgroundPictureBean().isUseBackgroundFile();
-        if (isUseBackgroundFile && mfRecivedCropPicture.exists()) {
-            try {
-                String szBackgroundFilePath = utils.getBackgroundDir() + getBackgroundFileName();
-                Drawable drawableBackground = FileUtils.getImageDrawable(szBackgroundFilePath);
-                drawableBackground.setAlpha(120);
-                ivPreviewBackground.setImageDrawable(drawableBackground);
-                ToastUtils.show("Use acceptRecived background.");
-            } catch (IOException e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            }
+        File sourceFile = new File(utils.getBackgroundDir(), szPreRecivedPictureName);
+        if (FileUtils.copyFile(sourceFile, mfRecivedPicture)) {
+            startCropImageActivity(false);
         } else {
-            ToastUtils.show(" No background.");
-            Drawable drawableBackground = getDrawable(R.drawable.blank10x10);
-            drawableBackground.setAlpha(120);
-            ivPreviewBackground.setImageDrawable(drawableBackground);
+            ToastUtils.show("图片复制失败，请重试");
         }
     }
 
+    /**
+     * 更新背景图片预览
+     */
+    public void updatePreviewBackground() {
+        LogUtils.d(TAG, "updatePreviewBackground");
+        ImageView ivPreviewBackground = (ImageView) findViewById(R.id.activitybackgroundpictureImageView1);
+        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
+        utils.loadBackgroundPictureBean();
+
+        boolean isUseBackgroundFile = utils.getBackgroundPictureBean().isUseBackgroundFile();
+        if (isUseBackgroundFile && mfRecivedCropPicture.exists()) {
+            try {
+                String filePath = utils.getBackgroundDir() + getBackgroundFileName();
+                Drawable drawable = FileUtils.getImageDrawable(filePath);
+                if (drawable != null) {
+                    //drawable.setAlpha(120);
+                    ivPreviewBackground.setImageDrawable(drawable);
+                }
+                //ToastUtils.show("背景图片已更新");
+            } catch (IOException e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                ToastUtils.show("背景图片加载失败");
+            }
+        } else {
+            ToastUtils.show("未使用背景图片");
+            Drawable drawable = getResources().getDrawable(R.drawable.blank10x10);
+            if (drawable != null) {
+                drawable.setAlpha(120);
+                ivPreviewBackground.setImageDrawable(drawable);
+            }
+        }
+    }
+
+    // 点击事件监听器
     private View.OnClickListener onOriginNullClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            // 选择原始空白背景
             BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
             BackgroundPictureBean bean = utils.getBackgroundPictureBean();
             bean.setIsUseBackgroundFile(false);
@@ -196,11 +200,10 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
     private View.OnClickListener onSelectPictureClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            // 导入外部图片
-            Intent intent = new Intent(
-                Intent.ACTION_PICK,
-                android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-            startActivityForResult(intent, REQUEST_SELECT_PICTURE);
+            if (checkAndRequestStoragePermission()) {
+                Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+                startActivityForResult(intent, REQUEST_SELECT_PICTURE);
+            }
         }
     };
 
@@ -211,7 +214,7 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
             if (fCheck.exists()) {
                 startCropImageActivity(false);
             } else {
-                ToastUtils.show("There is not any picture to crop.");
+                ToastUtils.show("没有可剪裁的图片");
             }
         }
     };
@@ -223,7 +226,7 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
             if (fCheck.exists()) {
                 startCropImageActivity(true);
             } else {
-                ToastUtils.show("There is not any picture to crop.");
+                ToastUtils.show("没有可剪裁的图片");
             }
         }
     };
@@ -233,6 +236,7 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         public void onClick(View v) {
             LogUtils.d(TAG, "onTakePhotoClickListener");
             LogUtils.d(TAG, "mfTakePhoto : " + mfTakePhoto.getPath());
+
             if (mfTakePhoto.exists()) {
                 mfTakePhoto.delete();
             }
@@ -240,56 +244,94 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
                 mfTakePhoto.createNewFile();
             } catch (IOException e) {
                 LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                ToastUtils.show("拍照文件创建失败");
+                return;
+            }
+
+            if (checkAndRequestStoragePermission()) {
+                Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
             }
-            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-            startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
         }
     };
 
     private View.OnClickListener onReceivedPictureClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            // 选择接收到的背景图片
             BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-			utils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
+            utils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
             utils.saveData();
             updatePreviewBackground();
         }
     };
 
+	private View.OnClickListener onPixelPickerClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+			// 从文件路径启动像素拾取活动
+			//String imagePath = "/storage/emulated/0/DCIM/Camera/sample.jpg";
+			String imagePath = mfRecivedCropPicture.toString();
+			Intent intent = new Intent(getApplicationContext(), PixelPickerActivity.class);
+			intent.putExtra("imagePath", imagePath);
+			startActivity(intent);
+            //App.getWinBoLLActivityManager().startWinBoLLActivity(getActivity(), intent, PixelPickerActivity.class);
+        }
+    };
+
+	private View.OnClickListener onCleanPixelClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+			BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
+			BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+			bean.setPixelColor(0);
+			utils.saveData();
+			setBackgroundColor();
+        }
+    };
+
+    /**
+     * 压缩图片并保存到接收文件
+     */
     void compressQualityToRecivedPicture(Bitmap bitmap) {
-        // 设置输出流
         OutputStream outStream = null;
         try {
-            // 创建输出流对象，准备写入压缩后的图片文件
             mfRecivedPicture = getRecivedPictureFile(this);
-            // 创建新的接收文件
             if (!mfRecivedPicture.exists()) {
                 mfRecivedPicture.createNewFile();
             }
 
             FileOutputStream fos = new FileOutputStream(mfRecivedPicture);
-
-            // 获取输出流对象
             outStream = new BufferedOutputStream(fos);
-
-            // 使用默认的质量参数压缩图片
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outStream); // 70% 的质量
-
-            // 关闭输出流以完成文件操作
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outStream);
             outStream.flush();
-            outStream.close();
         } catch (IOException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            ToastUtils.show("图片压缩失败");
+        } finally {
+            if (outStream != null) {
+                try {
+                    outStream.close();
+                } catch (IOException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
+            }
+            if (bitmap != null && !bitmap.isRecycled()) {
+                bitmap.recycle();
+            }
         }
     }
 
+    /**
+     * 启动图片裁剪活动
+     * @param isCropFree 是否自由裁剪
+     */
     public void startCropImageActivity(boolean isCropFree) {
         LogUtils.d(TAG, "startCropImageActivity");
         BackgroundPictureBean bean = mBackgroundPictureUtils.loadBackgroundPictureBean();
         mfRecivedPicture = getRecivedPictureFile(this);
         Uri uri = UriUtil.getUriForFile(this, mfRecivedPicture);
         LogUtils.d(TAG, "uri : " + uri.toString());
+
         if (mfTempCropPicture.exists()) {
             mfTempCropPicture.delete();
         }
@@ -297,27 +339,24 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
             mfTempCropPicture.createNewFile();
         } catch (IOException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            ToastUtils.show("剪裁临时文件创建失败");
+            return;
         }
-        // 使用正确的文件路径构建 Uri
+
         Uri cropOutPutUri = Uri.fromFile(mfTempCropPicture);
         LogUtils.d(TAG, "mfTempCropPicture : " + mfTempCropPicture.getPath());
+
         Intent intent = new Intent("com.android.camera.action.CROP");
         intent.setDataAndType(uri, "image/" + _mszCommonFileType);
-        // 下面这个crop=true是设置在开启的Intent中设置显示的VIEW可裁剪
         intent.putExtra("crop", "true");
         intent.putExtra("noFaceDetection", true);
+
         if (!isCropFree) {
-            // aspectX aspectY 是宽高的比例
             intent.putExtra("aspectX", bean.getBackgroundWidth());
             intent.putExtra("aspectY", bean.getBackgroundHeight());
         }
-        // outputX outputY 是裁剪图片宽高
-        //intent.putExtra("outputX", 100);
-        //intent.putExtra("outputY", 100);
-        //return-data =false 意味着裁剪成功后不能在onActivityResult 的intent 中获得图片
-        //intent.putExtra("return-data", false);
+
         intent.putExtra("return-data", true);
-        //裁剪后的图片输出至  cropOutPutUri
         intent.putExtra(MediaStore.EXTRA_OUTPUT, cropOutPutUri);
         intent.putExtra("scale", true);
         intent.putExtra("outputFormat", Bitmap.CompressFormat.JPEG.toString());
@@ -325,13 +364,102 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         startActivityForResult(intent, REQUEST_CROP_IMAGE);
     }
 
-    // 启动裁剪窗口，裁剪操作文件为 uirImage
-    //
+    /**
+     * 保存剪裁后的Bitmap（优化版）
+     */
+    private void saveCropBitmap(Bitmap bitmap) {
+        if (bitmap == null) {
+            ToastUtils.show("剪裁图片为空");
+            return;
+        }
+
+        // 内存优化：大图片自动缩放
+        Bitmap scaledBitmap = bitmap;
+        if (bitmap.getByteCount() > 10 * 1024 * 1024) { // 超过10MB
+            float scale = 1.0f;
+            while (scaledBitmap.getByteCount() > 5 * 1024 * 1024) {
+                scale -= 0.2f; // 每次缩小20%
+                if (scale < 0.2f) break; // 最小缩放到20%
+                scaledBitmap = scaleBitmap(scaledBitmap, scale);
+            }
+            if (scaledBitmap != bitmap) {
+                bitmap.recycle(); // 回收原Bitmap
+            }
+        }
+
+        // 优化：创建保存目录
+        File backgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
+        if (!backgroundDir.exists()) {
+            if (!backgroundDir.mkdirs()) {
+                ToastUtils.show("无法创建保存目录");
+                if (scaledBitmap != bitmap) scaledBitmap.recycle();
+                return;
+            }
+        }
+
+        File saveFile = new File(backgroundDir, getBackgroundFileName());
+
+        // 优化：检查文件是否可写
+        if (saveFile.exists() && !saveFile.canWrite()) {
+            if (!saveFile.delete()) {
+                ToastUtils.show("无法删除旧文件");
+                if (scaledBitmap != bitmap) scaledBitmap.recycle();
+                return;
+            }
+        }
+
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(saveFile);
+            boolean success = scaledBitmap.compress(Bitmap.CompressFormat.JPEG, 80, fos);
+            fos.flush();
+            if (success) {
+                ToastUtils.show("保存成功");
+                // 更新数据
+                mBackgroundPictureUtils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
+                updatePreviewBackground();
+            } else {
+                ToastUtils.show("图片压缩保存失败");
+            }
+        } catch (FileNotFoundException e) {
+            LogUtils.e(TAG, "文件未找到" + e);
+            ToastUtils.show("保存失败：文件路径错误");
+        } catch (IOException e) {
+            LogUtils.e(TAG, "写入异常" + e);
+            ToastUtils.show("保存失败：磁盘可能已满或路径错误");
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "流关闭异常" + e);
+                }
+            }
+            if (scaledBitmap != null && !scaledBitmap.isRecycled()) {
+                scaledBitmap.recycle();
+            }
+        }
+    }
+
+    /**
+     * 缩放Bitmap
+     */
+    private Bitmap scaleBitmap(Bitmap original, float scale) {
+        if (original == null) {
+            return null;
+        }
+        int width = (int) (original.getWidth() * scale);
+        int height = (int) (original.getHeight() * scale);
+        return Bitmap.createScaledBitmap(original, width, height, true);
+    }
+
+    /**
+     * 分享图片
+     */
     void sharePicture() {
         Uri uri = UriUtil.getUriForFile(this, mfRecivedPicture);
-        Intent shareIntent = new Intent();    
-        shareIntent.setAction(Intent.ACTION_SEND);    
-        shareIntent.putExtra(Intent.EXTRA_STREAM, uri);    
+        Intent shareIntent = new Intent(Intent.ACTION_SEND);
+        shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
         shareIntent.setType("image/" + _mszCommonFileType);
         shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         startActivity(Intent.createChooser(shareIntent, "Share Image"));
@@ -345,45 +473,121 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == REQUEST_SELECT_PICTURE) {
-            // 处理选择后图片
-            if (resultCode == RESULT_OK) {
-                try {
-                    Uri selectedImage = data.getData(); 
-                    LogUtils.d(TAG, "Uri is : " + selectedImage.toString());
-                    File fSrcImage = new File(UriUtil.getFilePathFromUri(this, selectedImage));
-                    mfRecivedPicture = getRecivedPictureFile(this);
-
-                    FileUtils.copyFile(fSrcImage, mfRecivedPicture);
-                    // 启动剪裁文件窗口
+        if (requestCode == REQUEST_SELECT_PICTURE && resultCode == RESULT_OK) {
+            try {
+                Uri selectedImage = data.getData();
+                LogUtils.d(TAG, "Uri is : " + selectedImage.toString());
+                File fSrcImage = new File(UriUtil.getFilePathFromUri(this, selectedImage));
+                mfRecivedPicture = getRecivedPictureFile(this);
+                if (FileUtils.copyFile(fSrcImage, mfRecivedPicture)) {
                     startCropImageActivity(false);
-                } catch (Exception e) {
-                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                } else {
+                    ToastUtils.show("图片复制失败，请重试");
                 }
+            } catch (Exception e) {
+                LogUtils.e(TAG, "选择图片异常" + e);
+                ToastUtils.show("选择图片失败：" + e.getMessage());
             }
-        } else if (requestCode == REQUEST_TAKE_PHOTO) {
-            if (resultCode == RESULT_OK) {
-                LogUtils.d(TAG, "REQUEST_TAKE_PHOTO");
-                Bundle extras = data.getExtras();
+        } else if (requestCode == REQUEST_TAKE_PHOTO && resultCode == RESULT_OK) {
+            LogUtils.d(TAG, "REQUEST_TAKE_PHOTO");
+            Bundle extras = data.getExtras();
+            if (extras != null) {
                 Bitmap imageBitmap = (Bitmap) extras.get("data");
-                compressQualityToRecivedPicture(imageBitmap);
-                startCropImageActivity(false);
-            }
-        } else if (requestCode == REQUEST_CROP_IMAGE) {
-            if (resultCode == RESULT_OK) {
-                LogUtils.d(TAG, "CROP_IMAGE_REQUEST_CODE");
-                FileUtils.copyFile(mfTempCropPicture, mfRecivedCropPicture);
-                mfTempCropPicture.delete();
-                mBackgroundPictureUtils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
-                updatePreviewBackground();
+                if (imageBitmap != null) {
+                    compressQualityToRecivedPicture(imageBitmap);
+                    startCropImageActivity(false);
+                } else {
+                    ToastUtils.show("拍照图片为空");
+                }
+            } else {
+                ToastUtils.show("拍照数据获取失败");
             }
+        } else if (requestCode == REQUEST_CROP_IMAGE && resultCode == RESULT_OK) {
+            LogUtils.d(TAG, "CROP_IMAGE_REQUEST_CODE");
+            try {
+                Bitmap cropBitmap = null;
+                // 方案1：通过Intent获取剪裁后的Bitmap
+                if (data != null && data.hasExtra("data")) {
+                    cropBitmap = data.getParcelableExtra("data");
+                } else if (mfTempCropPicture.exists()) {
+                    cropBitmap = BitmapFactory.decodeFile(mfTempCropPicture.getPath());
+                } else {
+                    ToastUtils.show("剪裁文件不存在");
+                    return;
+                }
 
-        } else {
-            String sz = "Unsolved requestCode = " + Integer.toString(requestCode);
-            Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
-            LogUtils.d(TAG, sz);
+                if (cropBitmap != null) {
+                    saveCropBitmap(cropBitmap);
+                } else {
+                    ToastUtils.show("获取剪裁图片失败");
+                }
+            } catch (OutOfMemoryError e) {
+                LogUtils.e(TAG, "内存溢出" + e);
+                ToastUtils.show("保存失败：内存不足，请尝试裁剪更小的图片");
+            } catch (Exception e) {
+                LogUtils.e(TAG, "剪裁保存异常" + e);
+                ToastUtils.show("保存失败：" + e.getMessage());
+            }/* finally {
+			 // 安全删除临时文件
+			 if (mfTempCropPicture.exists()) {
+			 mfTempCropPicture.delete();
+			 }
+			 }*/
+        } else if (resultCode != RESULT_OK) {
+            LogUtils.d(TAG, "操作取消或失败，requestCode: " + requestCode);
+            ToastUtils.show("操作已取消");
         }
     }
+
+    /**
+     * 检查类型是否为图片
+     */
+    private boolean isImageType(String type) {
+        return type.startsWith("image/") || "image/jpeg".equals(type) || 
+            "image/jpg".equals(type) || "image/png".equals(type) || 
+            "image/webp".equals(type);
+    }
+
+    /**
+     * 检查并申请存储权限
+     */
+    private boolean checkAndRequestStoragePermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(this, 
+                                                  new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 
+                                                  STORAGE_PERMISSION_REQUEST);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == STORAGE_PERMISSION_REQUEST) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                ToastUtils.show("存储权限已获取");
+            } else {
+                ToastUtils.show("需要存储权限才能保存图片");
+            }
+        }
+    }
+
+	void setBackgroundColor() {
+		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
+		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		int nPixelColor = bean.getPixelColor();
+		RelativeLayout mainLayout = findViewById(R.id.activitybackgroundpictureRelativeLayout1);
+		mainLayout.setBackgroundColor(nPixelColor);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		setBackgroundColor();
+	}
 }
+

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java

@@ -0,0 +1,231 @@
+package cc.winboll.studio.powerbell.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/22 14:15
+ */
+import android.app.Activity;
+import android.app.Dialog;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
+import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
+import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+
+public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActivity {
+
+	public static final String TAG = "PixelPickerActivity";
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+
+	private AToolbar mAToolbar;
+	private ImageView imageView;
+	private Bitmap originalBitmap;
+	private TextView infoText;
+	private ViewGroup imageContainer;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_pixelpicker);
+
+
+        // 初始化工具栏
+        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
+        setActionBar(mAToolbar);
+        mAToolbar.setSubtitle(R.string.subtitle_activity_pixelpicker);
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
+
+		imageView = findViewById(R.id.imageView);
+		infoText = findViewById(R.id.infoText);
+		imageContainer = findViewById(R.id.imageContainer);
+
+		// 从Intent获取图片路径并加载
+		String imagePath = getIntent().getStringExtra("imagePath");
+		if (imagePath != null) {
+			loadImage(imagePath);
+		} else {
+			infoText.setText("未找到图片路径");
+		}
+
+		// 设置图片点击事件
+		imageContainer.setOnTouchListener(new View.OnTouchListener() {
+				@Override
+				public boolean onTouch(View v, MotionEvent event) {
+					if (event.getAction() == MotionEvent.ACTION_DOWN && originalBitmap != null) {
+						// 计算点击位置在图片上的实际坐标
+						float touchX = event.getX();
+						float touchY = event.getY();
+
+						int pixelX = -1, pixelY = -1;
+						try {
+							// 获取图片在容器中的实际位置和尺寸
+							int[] imageLocation = new int[2];
+							imageView.getLocationInWindow(imageLocation);
+							int imageWidth = imageView.getWidth();
+							int imageHeight = imageView.getHeight();
+
+							// 计算缩放比例
+							float scaleX = (float) originalBitmap.getWidth() / imageWidth;
+							float scaleY = (float) originalBitmap.getHeight() / imageHeight;
+
+							// 调整触摸坐标到图片坐标系
+							float adjustedX = touchX - imageLocation[0];
+							float adjustedY = touchY - imageLocation[1];
+
+							// 检查是否在图片范围内
+							if (adjustedX >= 0 && adjustedX <= imageWidth && adjustedY >= 0 && adjustedY <= imageHeight) {
+								// 计算实际像素坐标
+								pixelX = (int) (adjustedX * scaleX);
+								pixelY = (int) (adjustedY * scaleY);
+
+								// 再次检查像素坐标是否在有效范围内
+								if (pixelX >= 0 && pixelX < originalBitmap.getWidth() && 
+									pixelY >= 0 && pixelY < originalBitmap.getHeight()) {
+									int pixelColor = originalBitmap.getPixel(pixelX, pixelY);
+									showPixelDialog(pixelColor, pixelX, pixelY);
+								} else {
+									Toast.makeText(PixelPickerActivity.this, "像素坐标超出范围", Toast.LENGTH_SHORT).show();
+								}
+							} else {
+								Toast.makeText(PixelPickerActivity.this, "点击位置超出图片显示范围", Toast.LENGTH_SHORT).show();
+							}
+						} catch (Exception e) {
+							e.printStackTrace();
+							Toast.makeText(PixelPickerActivity.this, "计算像素位置失败", Toast.LENGTH_SHORT).show();
+						}
+					}
+					return true;
+				}
+			});
+	}
+
+	/**
+	 * 加载图片
+	 */
+	private void loadImage(String imagePath) {
+		try {
+			File file = new File(imagePath);
+			if (file.exists()) {
+				// 解码图片
+				BitmapFactory.Options options = new BitmapFactory.Options();
+				options.inSampleSize = 1; // 加载原图
+				originalBitmap = BitmapFactory.decodeStream(new FileInputStream(file), null, options);
+
+				if (originalBitmap != null) {
+					imageView.setImageBitmap(originalBitmap);
+					infoText.setText("图片已加载，点击获取像素值");
+				} else {
+					infoText.setText("图片加载失败");
+				}
+			} else {
+				infoText.setText("图片文件不存在");
+			}
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+			infoText.setText("图片文件未找到");
+		}
+	}
+
+	/**
+	 * 显示像素对话框
+	 */
+	private void showPixelDialog(final int pixelColor, int x, int y) {
+		Dialog dialog = new Dialog(this);
+		dialog.setContentView(R.layout.dialog_pixel);
+		dialog.setCancelable(true);
+
+		// 设置像素颜色视图背景
+		TextView colorView = dialog.findViewById(R.id.pixelColorView);
+		colorView.setBackgroundColor(pixelColor);
+
+		// 显示颜色信息
+		TextView infoText = dialog.findViewById(R.id.colorInfoText);
+		String colorInfo = String.format(
+			"RGB: (%d, %d, %d)\n" +
+			"ARGB: #%08X\n" +
+			"实际像素位置: (%d, %d)",
+			Color.red(pixelColor),
+			Color.green(pixelColor),
+			Color.blue(pixelColor),
+			pixelColor,
+			x, y);
+		infoText.setText(colorInfo);
+
+		// 设置确定按钮点击事件
+		Button confirmButton = dialog.findViewById(R.id.confirmButton);
+		confirmButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					dialog.dismiss();
+					// 可以在这里添加确定后的回调逻辑
+					BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(PixelPickerActivity.this);
+					BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+					bean.setPixelColor(pixelColor);
+					utils.saveData();
+					Toast.makeText(PixelPickerActivity.this, "已记录像素值", Toast.LENGTH_SHORT).show();
+					setBackgroundColor();
+				}
+			});
+
+		dialog.show();
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		// 回收Bitmap资源
+		if (originalBitmap != null && !originalBitmap.isRecycled()) {
+			originalBitmap.recycle();
+			originalBitmap = null;
+		}
+	}
+
+
+	void setBackgroundColor() {
+		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(PixelPickerActivity.this);
+		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		int nPixelColor = bean.getPixelColor();
+		RelativeLayout mainLayout = findViewById(R.id.activitypixelpickerRelativeLayout1);
+		mainLayout.setBackgroundColor(nPixelColor);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		setBackgroundColor();
+	}
+}
+
+
+	

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/WinBoLLActivity.java

@@ -0,0 +1,25 @@
+package cc.winboll.studio.powerbell.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/19 20:35
+ * @Describe 应用窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
+
+public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BackgroundPictureBean.java

@@ -17,6 +17,8 @@ public class BackgroundPictureBean extends BaseBean {
     int backgroundWidth = 100;
     int backgroundHeight = 100;
     boolean isUseBackgroundFile = false;
+	// 图片拾取像素颜色
+	int pixelColor = 0;
 
     public BackgroundPictureBean() {
     }
@@ -25,6 +27,14 @@ public class BackgroundPictureBean extends BaseBean {
         this.isUseBackgroundFile = isUseBackgroundFile;
     }
 
+	public void setPixelColor(int pixelColor) {
+		this.pixelColor = pixelColor;
+	}
+
+	public int getPixelColor() {
+		return pixelColor;
+	}
+
     public void setBackgroundWidth(int backgroundWidth) {
         this.backgroundWidth = backgroundWidth;
     }
@@ -61,6 +71,7 @@ public class BackgroundPictureBean extends BaseBean {
         jsonWriter.name("backgroundWidth").value(bean.getBackgroundWidth());
         jsonWriter.name("backgroundHeight").value(bean.getBackgroundHeight());
         jsonWriter.name("isUseBackgroundFile").value(bean.isUseBackgroundFile());
+		jsonWriter.name("pixelColor").value(bean.getPixelColor());
     }
 
     @Override
@@ -75,6 +86,8 @@ public class BackgroundPictureBean extends BaseBean {
                 bean.setBackgroundHeight(jsonReader.nextInt());
             } else if (name.equals("isUseBackgroundFile")) {
                 bean.setIsUseBackgroundFile(jsonReader.nextBoolean());
+            } else if (name.equals("pixelColor")) {
+                bean.setPixelColor(jsonReader.nextInt());
             } else {
                 jsonReader.skipValue();
             }

powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java

@@ -311,11 +311,11 @@ public class MainViewFragment extends Fragment {
         LogUtils.d(TAG, String.format("fBackgroundFilePath.exists() %s", fBackgroundFilePath.exists()));
         if (bean.isUseBackgroundFile() && fBackgroundFilePath.exists()) {
             Drawable drawableBackground = Drawable.createFromPath(szBackgroundFilePath);
-            drawableBackground.setAlpha(120);
+            //drawableBackground.setAlpha(120);
             imageView.setImageDrawable(drawableBackground);
         } else {
             Drawable drawableBackground = getActivity().getDrawable(R.drawable.blank10x10);
-            drawableBackground.setAlpha(120);
+            //drawableBackground.setAlpha(120);
             imageView.setImageDrawable(drawableBackground);
         }
     }

powerbell/src/main/res/layout/activity_backgroundpicture.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
@@ -12,83 +12,110 @@
 		android:id="@+id/toolbar"
 		style="@style/DefaultAToolbar"/>
 
-	<ImageView
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:id="@+id/activitybackgroundpictureImageView1"
-		android:layout_below="@id/toolbar">
-
-	</ImageView>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_below="@id/toolbar">
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content">
 
 		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/activitybackgroundpictureRelativeLayout1"/>
 
-			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="160dp"
-				android:layout_height="36dp"
-				android:text="Origin BG"
-				android:id="@+id/activitybackgroundpictureAButton5"
-				android:layout_alignParentLeft="true"
-				android:layout_margin="5dp"/>
 
-			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="160dp"
-				android:layout_height="36dp"
-				android:text="Received BG"
-				android:id="@+id/activitybackgroundpictureAButton4"
-				android:layout_alignParentRight="true"
-				android:layout_margin="5dp"/>
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/activitybackgroundpictureImageView1"
+			android:layout_below="@id/toolbar">
 
-		</RelativeLayout>
+		</ImageView>
 
 		<LinearLayout
-			android:orientation="horizontal"
+			android:orientation="vertical"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:gravity="right">
+			android:layout_below="@id/toolbar">
 
-			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="50dp"
-				android:layout_height="36dp"
-				android:text="◎"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="10dp"
-				android:id="@+id/activitybackgroundpictureAButton1"/>
+			<RelativeLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
 
-			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="50dp"
-				android:layout_height="36dp"
-				android:text="☑"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="10dp"
-				android:id="@+id/activitybackgroundpictureAButton2"/>
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="160dp"
+					android:layout_height="36dp"
+					android:text="Origin BG"
+					android:id="@+id/activitybackgroundpictureAButton5"
+					android:layout_alignParentLeft="true"
+					android:layout_margin="5dp"/>
 
-			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="50dp"
-				android:layout_height="36dp"
-				android:text="[+]"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="10dp"
-				android:id="@+id/activitybackgroundpictureAButton3"/>
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="160dp"
+					android:layout_height="36dp"
+					android:text="Received BG"
+					android:id="@+id/activitybackgroundpictureAButton4"
+					android:layout_alignParentRight="true"
+					android:layout_margin="5dp"/>
 
-			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="50dp"
-				android:layout_height="36dp"
-				android:text="[+~]"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="10dp"
-				android:id="@+id/activitybackgroundpictureAButton6"/>
+			</RelativeLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="◎"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton1"/>
+
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="☑"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton2"/>
+
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="[+]"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton3"/>
+
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="[+~]"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton6"/>
+
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="[◐]"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton7"/>
+				
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="[○]"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton8"/>
+				
+			</LinearLayout>
 
 		</LinearLayout>
 
-	</LinearLayout>
-
-</RelativeLayout>
+	</RelativeLayout>
+</LinearLayout>
 

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

@@ -2,42 +2,34 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<LinearLayout
-		android:orientation="horizontal"
+	<cc.winboll.studio.libaes.views.AToolbar
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"
+		style="@style/DefaultAToolbar"/>
 
-		<cc.winboll.studio.libaes.views.AToolbar
-			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height"
-			android:id="@+id/toolbar"
-			android:gravity="center_vertical"
-			style="@style/DefaultAToolbar"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
+	<RelativeLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="0dp"
 		android:layout_weight="1.0">
 
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/activitymainRelativeLayout1"
+			android:background="#FFEE2121"/>
+
 		<FrameLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:id="@+id/activitymainFrameLayout1"/>
 
-	</LinearLayout>
-
-	<cc.winboll.studio.libappbase.LogView
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="200dp"
-		android:id="@+id/logview"/>
+	</RelativeLayout>
 
 </LinearLayout>
 

powerbell/src/main/res/layout/activity_pixelpicker.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<cc.winboll.studio.libaes.views.AToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"
+		style="@style/DefaultAToolbar"/>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="#FFEE2121"
+			android:id="@+id/activitypixelpickerRelativeLayout1"/>
+
+		<FrameLayout
+			android:id="@+id/imageContainer"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent">
+
+			<ImageView
+				android:id="@+id/imageView"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:src="@drawable/ic_launcher"/>
+
+		</FrameLayout>
+
+		<TextView
+			android:id="@+id/infoText"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:layout_centerHorizontal="true"
+			android:padding="10dp"
+			android:background="#80000000"
+			android:textColor="#FFFFFF"
+			android:text="点击图片获取像素值"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
+

powerbell/src/main/res/layout/dialog_pixel.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="240dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/pixelColorView"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center_horizontal" />
+
+    <TextView
+        android:id="@+id/colorInfoText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        android:textColor="#333333"
+        android:textSize="14sp" />
+
+    <Button
+        android:id="@+id/confirmButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:background="@android:color/holo_blue_light"
+        android:text="确定"
+        android:textColor="@android:color/white" />
+</LinearLayout>
+

powerbell/src/main/res/layout/fragment_mainview.xml

@@ -43,15 +43,6 @@
 
 			</LinearLayout>
 
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="Tips"
-				android:textSize="@dimen/text_content_size"
-				android:id="@+id/fragmentandroidviewTextView1"
-				android:background="@drawable/bg_frame"
-				android:padding="10dp"/>
-
 		</LinearLayout>
 
 		<LinearLayout
@@ -205,6 +196,21 @@
 
 		</LinearLayout>
 
+		<LinearLayout
+			android:layout_height="wrap_content"
+			android:layout_width="match_parent">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="Tips"
+				android:textSize="@dimen/text_content_size"
+				android:id="@+id/fragmentandroidviewTextView1"
+				android:background="@drawable/bg_frame"
+				android:padding="10dp"/>
+
+		</LinearLayout>
+
 	</LinearLayout>
 
 </RelativeLayout>

powerbell/src/main/res/menu/toolbar_main.xml

@@ -9,6 +9,9 @@
     <item
         android:id="@+id/action_changepicture"
         android:title="@string/item_changepicture"/>
+    <item
+        android:id="@+id/action_log"
+        android:title="@string/item_logview"/>
     <item
         android:id="@+id/action_about"
         android:title="@string/item_aboutview"/>

powerbell/src/main/res/values-zh/strings.xml

@@ -15,6 +15,7 @@
     <string name="texthint_CustomSlideToCleanRecord">Slide Right To Clean Up APP Record.</string>
     <string name="subtitle_activity_clearrecord">清理记录</string>
     <string name="subtitle_activity_backgroundpicture">更换背景图片</string>
+    <string name="subtitle_activity_pixelpicker">背景像素拾取</string>
     <string name="subtitle_activity_about">关于应用</string>
     <string name="msg_AOHPCTCSeekBar_ClearRecord">&gt;&gt;&gt;Seek 100% To Clear Battery Record.&gt;&gt;&gt;</string>
 </resources>

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

@@ -18,6 +18,7 @@
     <string name="texthint_CustomSlideToCleanRecord">Slide Right To Clean Up APP Record.</string>
     <string name="subtitle_activity_clearrecord">Clean Record</string>
     <string name="subtitle_activity_backgroundpicture">Background Picture</string>
+    <string name="subtitle_activity_pixelpicker">Pixel Picker</string>
     <string name="subtitle_activity_about">About The APP</string>
     <string name="msg_AOHPCTCSeekBar_ClearRecord">&gt;&gt;&gt;Seek 100% To Clear Battery Record.&gt;&gt;&gt;</string>
 </resources>

settings.gradle-demo

@@ -22,7 +22,6 @@
 
 // JC 项目编译设置
 //include ':jc'
-//include ':libjc'
 //rootProject.name = "jc"
 
 // AES 项目编译设置