<contacts>APK 15.3.5 release Publish.

Merge remote-tracking branch 'origin/appbase' into contacts
<contacts>APK 15.3.4 release Publish.
2025-06-14 18:43:41 +08:00 · 2025-06-14 17:59:39 +08:00 · 2025-06-14 17:58:55 +08:00 · 2025-06-14 17:49:16 +08:00 · 2025-06-04 00:08:54 +08:00 · 2025-06-04 00:04:20 +08:00
22 changed files with 94 additions and 95 deletions
--- a/README.md
+++ b/README.md
@@ -115,9 +115,9 @@
 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
 ## ★. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
-## ★. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
 ## ★. 应用签名密钥 keystore 设置问题。一般调试编译只需用【Termux】cd 进 GenKeyStore 目录执行 $ bash gen_debug_keystore.sh 命令即可完成设置。
 ## ☆. 应用 WiBoLL 签名密钥配置问题<非必须考虑>。设置时需要 clone 【keystore】模块源码并拷贝模块目录的 appkey.jks 与 appkey.keystore 到项目根目录即可。
+## ☆. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
 ## ☆. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。


--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 20:42:40 HKT 2025
-stageCount=2
+#Mon Jun 09 01:44:28 HKT 2025
+stageCount=1
 libraryProject=libaes
 baseVersion=15.9
-publishVersion=15.9.1
+publishVersion=15.9.0
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.9.1
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 12:49:47 GMT 2025
+#Sun Jun 01 08:03:56 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=26
+buildCount=24
 baseBetaVersion=15.0.1
--- a/autoinstaller/build.properties
+++ b/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
--- a/contacts/build.properties
+++ b/contacts/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 20 13:02:18 HKT 2025
-stageCount=3
+#Sat Jun 14 18:43:41 HKT 2025
+stageCount=6
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.2
+publishVersion=15.3.5
 buildCount=0
-baseBetaVersion=15.3.3
+baseBetaVersion=15.3.6
--- a/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java
@@ -145,6 +145,14 @@ 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) {
@@ -158,14 +166,6 @@ 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++) {
--- a/jc/build.gradle
+++ b/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'])
 }
--- a/jc/build.properties
+++ b/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
--- a/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java
+++ b/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 类型
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 20:42:26 HKT 2025
-stageCount=2
+#Mon Jun 09 01:44:28 HKT 2025
+stageCount=1
 libraryProject=libaes
 baseVersion=15.9
-publishVersion=15.9.1
+publishVersion=15.9.0
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.9.1
--- a/libjc/build.properties
+++ b/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
--- a/libjc/src/main/java/cc/winboll/studio/libjc/Main.java
+++ b/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),
--- a/mymessagemanager/build.gradle
+++ b/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'
--- a/mymessagemanager/build.properties
+++ b/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
--- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java
+++ b/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);
--- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java
+++ b/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));

--- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java
+++ b/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);
    }

--- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java
+++ b/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;

--- a/mymessagemanager/src/main/res/layout/activity_unittest.xml
+++ b/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"
--- a/mymessagemanager/src/main/res/menu/toolbar_main.xml
+++ b/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>
--- a/mymessagemanager/src/main/res/menu/toolbar_main2.xml
+++ b/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>
--- a/settings.gradle-demo
+++ b/settings.gradle-demo
@@ -22,7 +22,6 @@

 // JC 项目编译设置
 //include ':jc'
-//include ':libjc'
 //rootProject.name = "jc"

 // AES 项目编译设置
Author	SHA1	Message	Date
ZhanGSKen	ac1c008035	<contacts>APK 15.3.5 release Publish.	2025-06-14 18:43:41 +08:00
ZhanGSKen	b124487cb1	Merge remote-tracking branch 'origin/appbase' into contacts	2025-06-14 17:59:39 +08:00
ZhanGSKen	9621d35f79	<contacts>APK 15.3.4 release Publish.	2025-06-14 17:58:55 +08:00
ZhanGSKen	17de0832a6	检验拨不通号码群排在查询通讯录联系人前面	2025-06-14 17:49:16 +08:00
ZhanGSKen	89dac91cc6	<contacts>APK 15.3.3 release Publish.	2025-06-04 00:08:54 +08:00
ZhanGSKen	3809c1bcab	编译调试	2025-06-04 00:04:20 +08:00