diff --git a/.winboll/bashPublishAPKAddTag.sh b/.winboll/bashPublishAPKAddTag.sh
index 0a51077f..d210d28d 100644
--- a/.winboll/bashPublishAPKAddTag.sh
+++ b/.winboll/bashPublishAPKAddTag.sh
@@ -113,10 +113,10 @@ if [[ $? -eq 0 ]]; then
# 如果Git已经提交了所有代码就执行标签和应用发布操作
# 预先询问是否添加工作流标签
- echo "Add Github Workflows Tag? (yes/No)"
- result=$(askAddWorkflowsTag)
- nAskAddWorkflowsTag=$?
- echo $result
+ #echo "Add Github Workflows Tag? (yes/No)"
+ #result=$(askAddWorkflowsTag)
+ #nAskAddWorkflowsTag=$?
+ #echo $result
# 发布应用
echo "Publishing WinBoLL APK ..."
@@ -138,17 +138,17 @@ if [[ $? -eq 0 ]]; then
fi
# 添加 GitHub 工作流标签
- if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
+ #if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
# 如果用户选择添加工作流标签
- result=$(addWorkflowsTag $1)
- if [[ $? -eq 0 ]]; then
- echo $result
+ #result=$(addWorkflowsTag $1)
+ #if [[ $? -eq 0 ]]; then
+ # echo $result
# 工作流标签添加成功
- else
- echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
- exit 1 # addWorkflowsTag 异常
- fi
- fi
+ #else
+ #echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
+ #exit 1 # addWorkflowsTag 异常
+ #fi
+ #fi
## 清理更新描述文件内容
echo "" > $1/app_update_description.txt
diff --git a/README.md b/README.md
index 67c6f0fe..01d66250 100644
--- a/README.md
+++ b/README.md
@@ -114,9 +114,12 @@
# 本项目要实际运用需要注意以下几个步骤：
# 在项目根目录下：
-## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
-## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
-## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
+## ★. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
+## ★. 项目模块编译环境设置(必须) 在根目录拷贝 gradle.properties-androidx-demo 或者 gradle.properties-android-demo 文件为 gradle.properties。
+## ★. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
+## ★. 应用签名密钥 keystore 设置问题。一般调试编译只需用【Termux】cd 进 GenKeyStore 目录执行 $ bash gen_debug_keystore.sh 命令即可完成设置。
+## ☆. 应用 WiBoLL 签名密钥配置问题<非必须考虑>。设置时需要 clone 【keystore】模块源码并拷贝模块目录的 appkey.jks 与 appkey.keystore 到项目根目录即可。
+## ☆. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
# ☆类库型项目编译方法
diff --git a/aes/build.gradle b/aes/build.gradle
index cd6188de..67c1a20e 100644
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -29,7 +29,7 @@ android {
// versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
- versionName "15.8"
+ versionName "15.9"
if(true) {
versionName = genVersionName("${versionName}")
}
diff --git a/aes/build.properties b/aes/build.properties
index 28b69bc6..0994e68f 100644
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue Jun 03 19:17:05 HKT 2025
-stageCount=2
+#Sat Jun 28 12:59:51 HKT 2025
+stageCount=3
libraryProject=libaes
-baseVersion=15.8
-publishVersion=15.8.1
+baseVersion=15.9
+publishVersion=15.9.2
buildCount=0
-baseBetaVersion=15.8.2
+baseBetaVersion=15.9.3
diff --git a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java
index 1be1c587..ecec6228 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java
+++ b/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=2&fromuid=1");
+ appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1");
appInfo.setAppAPKName("AES");
appInfo.setAppAPKFolderName("AES");
//appInfo.setIsAddDebugTools(false);
diff --git a/androidxdemo/build.gradle b/androidxdemo/build.gradle
index b789cbb9..366613a0 100644
--- a/androidxdemo/build.gradle
+++ b/androidxdemo/build.gradle
@@ -67,7 +67,7 @@ dependencies {
//api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
//api 'androidx.fragment:fragment:1.1.0'
- api 'cc.winboll.studio:libaes:15.8.0'
- api 'cc.winboll.studio:libapputils:15.8.1'
- api 'cc.winboll.studio:libappbase:15.8.1'
+ api 'cc.winboll.studio:libaes:15.9.2'
+ api 'cc.winboll.studio:libapputils:15.8.4'
+ api 'cc.winboll.studio:libappbase:15.8.4'
}
diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties
index b790ea1a..9bfd4a76 100644
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Mon May 19 21:43:40 GMT 2025
+#Sat Jun 28 05:02:54 GMT 2025
stageCount=0
libraryProject=
baseVersion=15.0
publishVersion=15.0.0
-buildCount=22
+buildCount=27
baseBetaVersion=15.0.1
diff --git a/appbase/build.gradle b/appbase/build.gradle
index e2b03776..f59582b9 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -30,7 +30,7 @@ android {
// versionName 更新后需要手动设置
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
- versionName "15.8"
+ versionName "15.9"
if(true) {
versionName = genVersionName("${versionName}")
}
diff --git a/appbase/build.properties b/appbase/build.properties
index e47cbecf..94624655 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue Jun 03 13:40:08 HKT 2025
-stageCount=5
+#Sun Aug 31 04:33:09 CST 2025
+stageCount=6
libraryProject=libappbase
-baseVersion=15.8
-publishVersion=15.8.4
+baseVersion=15.9
+publishVersion=15.9.5
buildCount=0
-baseBetaVersion=15.8.5
+baseBetaVersion=15.9.6
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index e8a8bdb9..66f68a38 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
android:label="@string/app_name"
android:theme="@style/MyAPPBaseTheme"
android:resizeableActivity="true"
- android:process=":App">
+ android:process=":App"
+ android:networkSecurityConfig="@xml/network_security_config">
-
-
@@ -105,7 +108,8 @@
-
@@ -122,7 +126,6 @@
android:name="android.max_aspect"
android:value="4.0"/>
-
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
index 0b3a8a44..7f55f8a9 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -62,6 +62,11 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
+ if(item.getItemId() == R.id.item_yun) {
+ GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, cc.winboll.studio.libappbase.activities.YunActivity.class);
+ } else if(item.getItemId() == R.id.item_logon) {
+ GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, cc.winboll.studio.libappbase.activities.LogonActivity.class);
+ }
// 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
return super.onOptionsItemSelected(item);
}
diff --git a/appbase/src/main/res/menu/toolbar_main.xml b/appbase/src/main/res/menu/toolbar_main.xml
index 7fac6448..41657dd1 100644
--- a/appbase/src/main/res/menu/toolbar_main.xml
+++ b/appbase/src/main/res/menu/toolbar_main.xml
@@ -5,6 +5,14 @@
android:id="@+id/item_home"
android:title="HOME"
android:icon="@drawable/ic_winboll"/>
+ -
+
+
+
+ winboll.cc
+
+
+
+
+ 10.8.0.250
+
+
diff --git a/autoinstaller/build.properties b/autoinstaller/build.properties
index d987d282..c20578cf 100644
--- a/autoinstaller/build.properties
+++ b/autoinstaller/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Sun May 04 05:32:00 GMT 2025
-stageCount=1
+#Tue Jun 24 09:54:47 HKT 2025
+stageCount=3
libraryProject=
baseVersion=15.2
-publishVersion=15.2.0
-buildCount=74
-baseBetaVersion=15.2.1
+publishVersion=15.2.2
+buildCount=0
+baseBetaVersion=15.2.3
diff --git a/contacts/README.md b/contacts/README.md
index d48aa8ba..3a2e48f4 100644
--- a/contacts/README.md
+++ b/contacts/README.md
@@ -3,7 +3,7 @@
https://github.com/aJIEw/PhoneCallApp.git
#### 介绍
-通讯录与拨号
+这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。
#### 软件架构
适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
diff --git a/contacts/build.gradle b/contacts/build.gradle
index 00166692..24e18ae9 100644
--- a/contacts/build.gradle
+++ b/contacts/build.gradle
@@ -45,9 +45,9 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
- 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 'cc.winboll.studio:libaes:15.9.2'
+ api 'cc.winboll.studio:libapputils:15.8.4'
+ api 'cc.winboll.studio:libappbase:15.8.4'
// 权限请求框架：https://github.com/getActivity/XXPermissions
api 'com.github.getActivity:XXPermissions:18.63'
diff --git a/contacts/build.properties b/contacts/build.properties
index a2f12cdb..1ae7c047 100644
--- 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
+#Thu Jul 17 09:57:24 HKT 2025
+stageCount=12
libraryProject=
baseVersion=15.3
-publishVersion=15.3.2
+publishVersion=15.3.11
buildCount=0
-baseBetaVersion=15.3.3
+baseBetaVersion=15.3.12
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java
index d447f79d..931846eb 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java
+++ b/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("APP");
+ appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。");
+ appInfo.setAppGitName("APPBase");
appInfo.setAppGitOwner("Studio");
appInfo.setAppGitAPPBranch(szBranchName);
appInfo.setAppGitAPPSubProjectFolder(szBranchName);
- appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
+ appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=4&extra=page%3D1");
appInfo.setAppAPKName("Contacts");
appInfo.setAppAPKFolderName("Contacts");
return new AboutView(mContext, appInfo);
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
index bea6b918..4664c02b 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
@@ -198,6 +198,9 @@ 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();
@@ -207,6 +210,7 @@ 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() {
@@ -243,6 +247,9 @@ 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) {
@@ -330,4 +337,8 @@ 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);
+ }
}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
index 8ad75ba3..58ed0961 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
@@ -5,13 +5,18 @@ 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;
@@ -47,6 +52,38 @@ public class CallLogAdapter extends RecyclerView.Adapter {
@@ -26,8 +32,10 @@ public class ContactAdapter extends RecyclerView.Adapter contactList;
+ Context mContext;
- public ContactAdapter(List contactList) {
+ public ContactAdapter(Context context, List contactList) {
+ mContext = context;
this.contactList = contactList;
}
@@ -41,6 +49,37 @@ public class ContactAdapter extends RecyclerView.Adapter
+
+
+
+
+
+
+
+
+ android:text="Add Demo Rules(While size is 0) and Test"
+ android:onClick="onTestMain"
+ android:textSize="10sp"
+ android:textAllCaps="false"/>
@@ -43,7 +45,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Test Phone"
- android:onClick="onTestPhone"/>
+ android:onClick="onTestPhone"
+ android:textAllCaps="false"/>
diff --git a/contacts/src/main/res/layout/item_contact.xml b/contacts/src/main/res/layout/item_contact.xml
index 5b3fd981..0006eaa9 100644
--- a/contacts/src/main/res/layout/item_contact.xml
+++ b/contacts/src/main/res/layout/item_contact.xml
@@ -9,7 +9,8 @@
+ android:layout_height="wrap_content"
+ android:id="@+id/itemcontactLinearLayout1">
+ android:text="连接"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml b/contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml
new file mode 100644
index 00000000..a3a0d16f
--- /dev/null
+++ b/contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml b/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml
new file mode 100644
index 00000000..1160161f
--- /dev/null
+++ b/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml
@@ -0,0 +1,9 @@
+
+
diff --git a/contacts/src/main/res/menu/toolbar_contact_phonenumber.xml b/contacts/src/main/res/menu/toolbar_contact_phonenumber.xml
new file mode 100644
index 00000000..b646763a
--- /dev/null
+++ b/contacts/src/main/res/menu/toolbar_contact_phonenumber.xml
@@ -0,0 +1,9 @@
+
+
diff --git a/contacts/src/main/res/values/strings.xml b/contacts/src/main/res/values/strings.xml
index 90972886..8817cbe4 100644
--- a/contacts/src/main/res/values/strings.xml
+++ b/contacts/src/main/res/values/strings.xml
@@ -2,6 +2,6 @@
Contacts
- http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip
+ https://gitea.winboll.cc/Studio/BoBullToon/archive/main.zip
diff --git a/jc/build.gradle b/jc/build.gradle
index d5a23cdb..dcf49e4a 100644
--- a/jc/build.gradle
+++ b/jc/build.gradle
@@ -42,23 +42,24 @@ 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'])
}
diff --git a/jc/build.properties b/jc/build.properties
index 1be8de68..85fc83ca 100644
--- a/jc/build.properties
+++ b/jc/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Fri Jan 10 22:03:57 GMT 2025
+#Tue Jun 24 11:17:30 GMT 2025
stageCount=0
libraryProject=libjc
baseVersion=1.0
publishVersion=1.0.0
-buildCount=133
+buildCount=135
baseBetaVersion=1.0.1
diff --git a/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java b/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java
index e853b681..b10f42dd 100644
--- 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(JAR_RUNNING_MODE.JC);
+ //_JCMainThread.setRunningMode(Main.JAR_RUNNING_MODE.JC);
_JCMainThread.start();
// 设置 WinBoll 应用 UI 类型
diff --git a/libaes/build.gradle b/libaes/build.gradle
index 5d4e14e2..2ada4d32 100644
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -21,8 +21,8 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
- api 'cc.winboll.studio:libapputils:15.8.2'
- api 'cc.winboll.studio:libappbase:15.8.2'
+ api 'cc.winboll.studio:libapputils:15.8.4'
+ api 'cc.winboll.studio:libappbase:15.8.4'
// 吐司类库
api 'com.github.getActivity:ToastUtils:10.5'
diff --git a/libaes/build.properties b/libaes/build.properties
index c45bc0db..75ec85fb 100644
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue Jun 03 19:16:41 HKT 2025
-stageCount=2
+#Sat Jun 28 12:59:30 HKT 2025
+stageCount=3
libraryProject=libaes
-baseVersion=15.8
-publishVersion=15.8.1
+baseVersion=15.9
+publishVersion=15.9.2
buildCount=0
-baseBetaVersion=15.8.2
+baseBetaVersion=15.9.3
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
index bb523634..bf223adb 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
+++ b/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://dev.winboll.cc": "https://www.winboll.cc";
+ mszWinBoLLServerHost = GlobalApplication.isDebuging() ? "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
try {
mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 39bd64ba..c5346fe4 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -22,4 +22,9 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
+ // 网络连接类库
+ api 'com.squareup.okhttp3:okhttp:4.4.1'
+ // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+
+ api 'com.google.code.gson:gson:2.10.1'
}
diff --git a/libappbase/build.properties b/libappbase/build.properties
index d7034efd..267add13 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue Jun 03 13:40:01 HKT 2025
-stageCount=5
+#Mon Aug 18 03:56:26 HKT 2025
+stageCount=6
libraryProject=libappbase
-baseVersion=15.8
-publishVersion=15.8.4
+baseVersion=15.9
+publishVersion=15.9.5
buildCount=0
-baseBetaVersion=15.8.5
+baseBetaVersion=15.9.6
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index dee879cd..353ddce5 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -103,6 +103,10 @@
+
+
+
+
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java
new file mode 100644
index 00000000..767d5708
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java
@@ -0,0 +1,150 @@
+package cc.winboll.studio.libappbase.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RadioButton;
+import cc.winboll.studio.libappbase.BuildConfig;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.R;
+import cc.winboll.studio.libappbase.models.UserInfoModel;
+import cc.winboll.studio.libappbase.utils.RSAUtils;
+import cc.winboll.studio.libappbase.utils.YunUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/04 13:29
+ * @Describe 用户登录框
+ */
+public class LogonActivity extends Activity implements IWinBoLLActivity {
+
+ public static final String TAG = "LogonActivity";
+
+ public static final String DEBUG_HOST = "http://10.8.0.250:456";
+ public static final String YUN_HOST = "https://yun.winboll.cc";
+
+
+ String mHost = "";
+ RadioButton mrbYunHost;
+ RadioButton mrbDebugHost;
+ LogView mLogView;
+
+ @Override
+ public Activity getActivity() {
+ return this;
+ }
+
+ @Override
+ public String getTag() {
+ return TAG;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_logon);
+ mLogView = findViewById(R.id.logview);
+ mLogView.start();
+
+ mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
+ if (BuildConfig.DEBUG) {
+ mrbYunHost = findViewById(R.id.rb_yunhost);
+ mrbDebugHost = findViewById(R.id.rb_debughost);
+ mrbYunHost.setChecked(!BuildConfig.DEBUG);
+ mrbDebugHost.setChecked(BuildConfig.DEBUG);
+ } else {
+ findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
+ }
+ }
+
+ public void onSwitchHost(View view) {
+ if (view.getId() == R.id.rb_yunhost) {
+ mrbDebugHost.setChecked(false);
+ mHost = YUN_HOST;
+ } else if (view.getId() == R.id.rb_debughost) {
+ mrbYunHost.setChecked(false);
+ mHost = DEBUG_HOST;
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mLogView.start();
+ }
+
+ public void onTestLogin(View view) {
+ LogUtils.d(TAG, "onTestLogin");
+ final YunUtils yunUtils = YunUtils.getInstance(this);
+
+ UserInfoModel userInfoModel = new UserInfoModel();
+ userInfoModel.setUsername("jian");
+ userInfoModel.setPassword("kkiio");
+ userInfoModel.setToken("aaa111");
+ yunUtils.login(mHost, userInfoModel);
+ }
+
+ public void onTestRSA(View view) {
+ LogUtils.d(TAG, "onTestRSA");
+ RSAUtils utils = RSAUtils.getInstance(this);
+
+ try {
+ // 测试 1：首次生成密钥对
+ LogUtils.d(TAG, "==== 首次生成密钥对 ====");
+ if (utils.keysExist()) {
+ LogUtils.d(TAG, "密钥对已生成");
+ } else {
+ utils.generateAndSaveKeys();
+ LogUtils.d(TAG, "密钥对生成成功。");
+ }
+
+ // 测试 2：获取密钥对（自动读取已生成的文件）
+ KeyPair keyPair = utils.getOrGenerateKeys();
+ PublicKey publicKey = keyPair.getPublic();
+ PrivateKey privateKey = keyPair.getPrivate();
+
+ // 打印密钥信息
+ LogUtils.d(TAG, "\n==== 密钥信息 ====");
+ LogUtils.d(TAG, "公钥算法：" + publicKey.getAlgorithm());
+ LogUtils.d(TAG, "公钥编码长度：" + publicKey.getEncoded().length + "字节");
+ LogUtils.d(TAG, "私钥算法：" + privateKey.getAlgorithm());
+ LogUtils.d(TAG, "私钥编码长度：" + privateKey.getEncoded().length + "字节");
+
+ // 测试 3：重复调用时检查是否复用文件
+ LogUtils.d(TAG, "\n==== 二次调用 ====");
+ KeyPair reusedPair = utils.getOrGenerateKeys();
+ LogUtils.d(TAG, "是否为同一公钥：" + (publicKey.equals(reusedPair.getPublic()))); // true（单例引用）
+ LogUtils.d(TAG, "操作完成");
+
+ String testMessage = "Hello, RSA Encryption!";
+
+ // 1. 获取或生成密钥对
+ PublicKey publicKeyReused = reusedPair.getPublic();
+ PrivateKey privateKeyReused = reusedPair.getPrivate();
+
+ // 2. 公钥加密
+ byte[] encryptedData = utils.encryptWithPublicKey(testMessage, publicKeyReused);
+ LogUtils.d(TAG, "加密后数据（字节长度）：" + encryptedData.length);
+
+ // 3. 私钥解密
+ String decryptedMessage = utils.decryptWithPrivateKey(encryptedData, privateKeyReused);
+ LogUtils.d(TAG, "解密结果: " + decryptedMessage);
+
+ // 4. 验证解密是否成功
+ if (testMessage.equals(decryptedMessage)) {
+ LogUtils.d(TAG, "加密解密测试通过！");
+ } else {
+ LogUtils.d(TAG, "测试失败：内容不一致");
+ }
+ } catch (Exception e) {
+ LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+ }
+ }
+
+
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java
new file mode 100644
index 00000000..c4e93e74
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java
@@ -0,0 +1,126 @@
+package cc.winboll.studio.libappbase.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import cc.winboll.studio.libappbase.BuildConfig;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.R;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import java.io.IOException;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import android.widget.RadioButton;
+import cc.winboll.studio.libappbase.LogView;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/04 11:06
+ * @Describe 云宝云
+ */
+public class YunActivity extends Activity implements IWinBoLLActivity {
+
+ public static final String TAG = "YunActivity";
+
+ public static final String DEBUG_HOST = "http://10.8.0.250:456";
+ public static final String YUN_HOST = "https://yun.winboll.cc";
+
+ String mHost = "";
+ RadioButton mrbYunHost;
+ RadioButton mrbDebugHost;
+ LogView mLogView;
+
+ @Override
+ public Activity getActivity() {
+ return this;
+ }
+
+ @Override
+ public String getTag() {
+ return TAG;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_yun);
+ mLogView = findViewById(R.id.logview);
+ mLogView.start();
+
+ mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
+ if (BuildConfig.DEBUG) {
+ mrbYunHost = findViewById(R.id.rb_yunhost);
+ mrbDebugHost = findViewById(R.id.rb_debughost);
+ mrbYunHost.setChecked(!BuildConfig.DEBUG);
+ mrbDebugHost.setChecked(BuildConfig.DEBUG);
+ } else {
+ findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
+ }
+ }
+
+ public void onSwitchHost(View view) {
+ if (view.getId() == R.id.rb_yunhost) {
+ mrbDebugHost.setChecked(false);
+ mHost = YUN_HOST;
+ } else if (view.getId() == R.id.rb_debughost) {
+ mrbYunHost.setChecked(false);
+ mHost = DEBUG_HOST;
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mLogView.start();
+ }
+
+ public void onTestYun(View view) {
+ LogUtils.d(TAG, "onTestYun");
+ (new Thread(new Runnable(){
+ @Override
+ public void run() {
+ testYun();
+ }
+ })).start();
+ }
+
+ void testYun() {
+ OkHttpClient client = new OkHttpClient();
+ Request request = new Request.Builder()
+ .url(mHost + "/backups/")
+ .build();
+
+ Response response = null;
+ try {
+ response = client.newCall(request).execute();
+ if (response.isSuccessful()) {
+ String responseBody = "";
+ if (response.body() != null) {
+ responseBody = response.body().string();
+ }
+
+ // 正则匹配：任意主机名 -> Test OK（主机名部分匹配非空字符）
+ boolean isMatch = responseBody.matches(".+? -> Test OK");
+
+ if (isMatch) {
+ LogUtils.d(TAG, responseBody);
+ } else {
+ LogUtils.d(TAG, "响应内容不匹配，内容：" + responseBody);
+ }
+ } else {
+ LogUtils.d(TAG, "请求失败，状态码：" + response.code());
+ }
+ } catch (IOException e) {
+ LogUtils.d(TAG, "读取响应体失败：" + e.getMessage());
+ } catch (Exception e) {
+ LogUtils.d(TAG, "异常：" + e.getMessage());
+ e.printStackTrace(); // Java 7 需显式打印堆栈
+ } finally {
+ // 手动关闭 Response（Java 7 不支持 try-with-resources）
+ if (response != null && response.body() != null) {
+ response.body().close();
+ }
+ }
+ }
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java
new file mode 100644
index 00000000..675f40bc
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java
@@ -0,0 +1,53 @@
+package cc.winboll.studio.libappbase.models;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/05 11:26
+ */
+
+public class ResponseData {
+
+ public static final String STATUS_SUCCESS = "success";
+ public static final String STATUS_ERROR = "error";
+
+ private String status;
+ private String message;
+ private UserInfoModel data;
+
+ public ResponseData() {
+ this.status = "";
+ this.message = "";
+ this.data = new UserInfoModel();
+ }
+
+ public ResponseData(String status, String message, UserInfoModel data) {
+ this.status = status;
+ this.message = message;
+ this.data = data;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setData(UserInfoModel data) {
+ this.data = data;
+ }
+
+ public UserInfoModel getData() {
+ return data;
+ }
+}
+
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java
new file mode 100644
index 00000000..3affb459
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java
@@ -0,0 +1,92 @@
+package cc.winboll.studio.libappbase.models;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/04 19:14
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class UserInfoModel extends BaseBean {
+
+ public static final String TAG = "UserInfoModel";
+
+ String username;
+ String password;
+ String token;
+
+ public UserInfoModel() {
+ this.username = "";
+ this.password = "";
+ this.token = "";
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setToken(String token) {
+ this.token = token;
+ }
+
+ public String getToken() {
+ return token;
+ }
+
+ @Override
+ public String getName() {
+ return UserInfoModel.class.getName();
+ }
+
+ @Override
+ public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+ super.writeThisToJsonWriter(jsonWriter);
+ jsonWriter.name("username").value(getUsername());
+ jsonWriter.name("password").value(getPassword());
+ jsonWriter.name("token").value(getToken());
+ }
+
+ @Override
+ public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+ if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+ if (name.equals("username")) {
+ setUsername(jsonReader.nextString());
+ } else if (name.equals("password")) {
+ setPassword(jsonReader.nextString());
+ } else if (name.equals("token")) {
+ setToken(jsonReader.nextString());
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+ jsonReader.beginObject();
+ while (jsonReader.hasNext()) {
+ String name = jsonReader.nextName();
+ if (!initObjectsFromJsonReader(jsonReader, name)) {
+ jsonReader.skipValue();
+ }
+ }
+ // 结束 JSON 对象
+ jsonReader.endObject();
+ return this;
+ }
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java
new file mode 100644
index 00000000..b56f2630
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java
@@ -0,0 +1,128 @@
+package cc.winboll.studio.libappbase.utils;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/04 20:15
+ * @Describe 文件操作类
+ */
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class FileUtils {
+ public static final String TAG = "FileUtils";
+
+ /**
+ * 读取文件为字节数组（Java 7 语法）
+ */
+ public static byte[] readFileToByteArray(String filePath) {
+ FileInputStream fis = null;
+ ByteArrayOutputStream bos = null;
+ try {
+ fis = new FileInputStream(filePath);
+ bos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+ while ((bytesRead = fis.read(buffer)) != -1) {
+ bos.write(buffer, 0, bytesRead);
+ }
+ return bos.toByteArray();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ // 手动关闭流（Java 7 不支持 try-with-resources）
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ if (bos != null) {
+ try {
+ bos.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ /**
+ * 写入字节数组到文件（Java 7 语法）
+ */
+ public static boolean writeByteArrayToFile(byte[] data, String filePath) {
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(filePath);
+ fos.write(data);
+ return true;
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ // 原字符串读写方法（适配 Java 7）
+ public static String readFileToString(String filePath) {
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new FileReader(filePath));
+ StringBuilder content = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ content.append(line).append(System.getProperty("line.separator"));
+ }
+ // 去除最后一个换行符（可选）
+ if (content.length() > 0) {
+ content.deleteCharAt(content.length() - 1);
+ }
+ return content.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ public static boolean writeStringToFile(String content, String filePath, boolean append) {
+ BufferedWriter writer = null;
+ try {
+ writer = new BufferedWriter(new FileWriter(filePath, append));
+ writer.write(content);
+ return true;
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (writer != null) {
+ try {
+ writer.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java
new file mode 100644
index 00000000..e5c58c35
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java
@@ -0,0 +1,222 @@
+package cc.winboll.studio.libappbase.utils;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/04 13:36
+ * @Describe RSA加密工具
+ */
+import android.content.Context;
+import android.util.Base64;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Objects;
+import javax.crypto.Cipher;
+
+public class RSAUtils {
+ private static final String TAG = "RSAUtils";
+ private static final int KEY_SIZE = 2048;
+ private static final String KEY_ALGORITHM = "RSA";
+ private static final String PUBLIC_KEY_FILE = "public.key";
+ private static final String PRIVATE_KEY_FILE = "private.key";
+ private static final String CIPHER_ALGORITHM = KEY_ALGORITHM + "/ECB/PKCS1Padding"; // 保留原加密方式
+
+ private final String keyPath;
+ private static volatile RSAUtils INSTANCE;
+
+ /**
+ * 构造方法：初始化密钥存储路径（内部存储）
+ */
+ private RSAUtils(Context context) {
+ keyPath = context.getFilesDir() + File.separator + "keys" + File.separator; // 修正路径格式
+ }
+
+ /**
+ * 获取单例实例
+ */
+ public static synchronized RSAUtils getInstance(Context context) {
+ if (INSTANCE == null) {
+ INSTANCE = new RSAUtils(context);
+ }
+ return INSTANCE;
+ }
+
+ /**
+ * 检查密钥文件是否存在
+ */
+ public boolean keysExist() {
+ File publicKeyFile = new File(keyPath + PUBLIC_KEY_FILE);
+ File privateKeyFile = new File(keyPath + PRIVATE_KEY_FILE);
+ return publicKeyFile.exists() && privateKeyFile.exists();
+ }
+
+ /**
+ * 生成密钥对并保存到文件
+ */
+ public void generateAndSaveKeys() throws Exception {
+ LogUtils.d(TAG, "开始生成 RSA 密钥对（2048位）");
+ KeyPairGenerator generator = KeyPairGenerator.getInstance(KEY_ALGORITHM);
+ generator.initialize(KEY_SIZE);
+ KeyPair keyPair = generator.generateKeyPair();
+
+ saveKey(PUBLIC_KEY_FILE, keyPair.getPublic().getEncoded());
+ saveKey(PRIVATE_KEY_FILE, keyPair.getPrivate().getEncoded());
+ LogUtils.d(TAG, "密钥对生成并保存成功");
+ }
+
+ /**
+ * 获取或生成密钥对（线程安全）
+ */
+ public KeyPair getOrGenerateKeys() throws Exception {
+ if (!keysExist()) {
+ synchronized (RSAUtils.class) { // 双重检查锁，避免多线程重复生成
+ if (!keysExist()) {
+ generateAndSaveKeys();
+ }
+ }
+ }
+ return readKeysFromFile();
+ }
+
+ /**
+ * 从文件读取密钥对
+ */
+ private KeyPair readKeysFromFile() throws Exception {
+ LogUtils.d(TAG, "读取密钥对文件");
+ try {
+ byte[] publicKeyBytes = readFileToBytes(keyPath + PUBLIC_KEY_FILE);
+ byte[] privateKeyBytes = readFileToBytes(keyPath + PRIVATE_KEY_FILE);
+
+ X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(publicKeyBytes);
+ PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(privateKeyBytes);
+
+ KeyFactory factory = KeyFactory.getInstance(KEY_ALGORITHM);
+ PublicKey publicKey = factory.generatePublic(publicSpec);
+ PrivateKey privateKey = factory.generatePrivate(privateSpec);
+
+ return new KeyPair(publicKey, privateKey);
+ } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+ LogUtils.e(TAG, "密钥文件读取失败：" + e.getMessage());
+ throw new Exception("密钥文件损坏或格式错误", e);
+ }
+ }
+
+ /**
+ * 保存密钥到文件（通用方法）
+ */
+ private void saveKey(String fileName, byte[] keyBytes) throws IOException {
+ Objects.requireNonNull(keyBytes, "密钥字节数据不可为空");
+ File dir = new File(keyPath);
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException("创建密钥目录失败：" + keyPath);
+ }
+
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(keyPath + fileName);
+ fos.write(keyBytes);
+ } finally {
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException e) {
+ LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
+ }
+ }
+ }
+ }
+
+ /**
+ * 读取文件为字节数组（Java 7 兼容）
+ */
+ private byte[] readFileToBytes(String filePath) throws IOException {
+ File file = new File(filePath);
+ if (!file.exists() || file.isDirectory()) {
+ throw new IOException("文件不存在或为目录：" + filePath);
+ }
+
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(file);
+ byte[] data = new byte[(int) file.length()];
+ int bytesRead = fis.read(data);
+ if (bytesRead != data.length) {
+ throw new IOException("文件读取不完整");
+ }
+ return data;
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
+ }
+ }
+ }
+ }
+
+ /**
+ * 公钥加密（带参数校验）
+ */
+ public byte[] encryptWithPublicKey(String plainText, PublicKey publicKey) throws Exception {
+ Objects.requireNonNull(plainText, "明文不可为空");
+ Objects.requireNonNull(publicKey, "公钥不可为空");
+
+ Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+ cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+
+ // 检查数据长度是否超过 RSA 限制（2048位密钥最大明文为 214字节，PKCS1Padding）
+ int maxPlainTextSize = cipher.getBlockSize() - 11; // PKCS1Padding 固定填充长度
+ if (plainText.getBytes("UTF-8").length > maxPlainTextSize) {
+ throw new IllegalArgumentException("明文过长，最大支持 " + maxPlainTextSize + " 字节");
+ }
+
+ return cipher.doFinal(plainText.getBytes("UTF-8"));
+ }
+
+ /**
+ * 私钥解密（带参数校验）
+ */
+ public String decryptWithPrivateKey(byte[] encryptedData, PrivateKey privateKey) throws Exception {
+ Objects.requireNonNull(encryptedData, "密文不可为空");
+ Objects.requireNonNull(privateKey, "私钥不可为空");
+
+ Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+ cipher.init(Cipher.DECRYPT_MODE, privateKey);
+ byte[] decryptedBytes = cipher.doFinal(encryptedData);
+ return new String(decryptedBytes, "UTF-8");
+ }
+ /**
+ * 将 HTTP 传输的 Base64 字符串还原为加密字节数组（Java 7 兼容）
+ * @param httpString Base64 字符串（非 null）
+ * @return 加密字节数组
+ * @throws IllegalArgumentException 解码失败时抛出
+ */
+ public byte[] httpStringToEncryptBytes(String httpString) {
+ Objects.requireNonNull(httpString, "HTTP 字符串不可为空");
+
+ // 计算缺失的填充符数量（Java 7 不支持 repeat()，手动拼接）
+ int pad = httpString.length() % 4;
+ StringBuilder paddedString = new StringBuilder(httpString);
+ if (pad != 0) {
+ for (int i = 0; i < pad; i++) {
+ paddedString.append('='); // 补全 '='
+ }
+ }
+
+ // 使用 Base64 解码（Android 原生 Base64 类兼容 Java 7）
+ return Base64.decode(paddedString.toString(), Base64.URL_SAFE);
+ }
+}
+
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java
new file mode 100644
index 00000000..7858da2a
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java
@@ -0,0 +1,281 @@
+package cc.winboll.studio.libappbase.utils;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/06/04 17:21
+ * @Describe 应用登录与接口工具
+ */
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.ResponseData;
+import cc.winboll.studio.libappbase.models.UserInfoModel;
+import com.google.gson.Gson;
+import java.io.File;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import java.io.UnsupportedEncodingException;
+
+public class YunUtils {
+ public static final String TAG = "YunUtils";
+ // 私有静态实例，类加载时创建
+ private static volatile YunUtils INSTANCE;
+ Context mContext;
+ UserInfoModel mUserInfoModel;
+ String token = "";
+ String mDataFolderPath = "";
+ String mUserInfoModelPath = "";
+
+ private static final int CONNECT_TIMEOUT = 15; // 连接超时时间（秒）
+ private static final int READ_TIMEOUT = 20; // 读取超时时间（秒）
+ private static volatile YunUtils instance;
+ private OkHttpClient okHttpClient;
+ private Handler mainHandler; // 主线程 Handler
+
+ // 私有构造方法，防止外部实例化
+ private YunUtils(Context context) {
+ LogUtils.d(TAG, "YunUtils");
+ mContext = context;
+ mDataFolderPath = mContext.getExternalFilesDir(TAG).toString();
+ File fTest = new File(mDataFolderPath);
+ if (!fTest.exists()) {
+ fTest.mkdirs();
+ }
+ mUserInfoModelPath = mDataFolderPath + File.separator + "UserInfoModel.rsajson";
+
+ okHttpClient = new OkHttpClient.Builder()
+ .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
+ .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
+ .build();
+ mainHandler = new Handler(Looper.getMainLooper()); // 获取主线程 Looper
+ }
+
+ // 公共静态方法，返回唯一实例
+ public static synchronized YunUtils getInstance(Context context) {
+ LogUtils.d(TAG, "getInstance");
+ if (INSTANCE == null) {
+ INSTANCE = new YunUtils(context);
+ }
+ return INSTANCE;
+ }
+
+ public void checkLoginStatus() {
+ String token = getLocalToken();
+ LogUtils.d(TAG, String.format("checkLoginStatus token is %s", token));
+ }
+
+ String getLocalToken() {
+ UserInfoModel userInfoModel = loadUserInfoModel();
+ return (userInfoModel == null) ?"": userInfoModel.getToken();
+ }
+
+ public void login(String host, UserInfoModel userInfoModel) {
+ LogUtils.d(TAG, "login");
+
+ // 发送 POST 请求
+ String apiUrl = host + "/login/index.php";
+ // 序列化对象为JSON
+ Gson gson = new Gson();
+ String jsonData = gson.toJson(userInfoModel); // 自动生成标准JSON
+ //String jsonData = userInfoModel.toString();
+ LogUtils.d(TAG, "要发送的数据 : " + jsonData);
+
+ sendPostRequest(apiUrl, jsonData, new OnResponseListener() {
+ // 成功回调（主线程）
+ @Override
+ public void onSuccess(String responseBody) {
+ LogUtils.d(TAG, "onSuccess");
+ LogUtils.d(TAG, String.format("responseBody %s", responseBody));
+ Gson gson = new Gson();
+ ResponseData result = gson.fromJson(responseBody, ResponseData.class); // 转为 Result 实例
+ if(result.getStatus().equals(ResponseData.STATUS_SUCCESS)) {
+
+ UserInfoModel userInfoModel = result.getData();
+ if (userInfoModel != null) {
+ LogUtils.d(TAG, "收到网站 UserInfoModel");
+ String token = userInfoModel.getToken();
+ saveLocalToken(token);
+ checkLoginStatus();
+ }
+
+ } else if(result.getStatus().equals(ResponseData.STATUS_ERROR)) {
+ try {
+ String decodedMessage = URLDecoder.decode(result.getMessage(), "UTF-8");
+ LogUtils.d(TAG, "服务器返回信息: " + decodedMessage);
+ } catch (UnsupportedEncodingException e) {
+ LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+ }
+ }
+ }
+
+ // 失败回调（主线程）
+ @Override
+ public void onFailure(String errorMsg) {
+ LogUtils.d(TAG, errorMsg);
+ // 处理错误
+ }
+ });
+ }
+
+ public void saveLocalToken(String token) {
+ UserInfoModel userInfoModel = new UserInfoModel();
+ userInfoModel.setToken(token);
+ saveUserInfoModel(userInfoModel);
+ }
+
+ UserInfoModel loadUserInfoModel() {
+ LogUtils.d(TAG, "loadUserInfoModel");
+ if (new File(mUserInfoModelPath).exists()) {
+ try {
+ // 加载加密后的模型数据
+ byte[] encryptedData = FileUtils.readFileToByteArray(mUserInfoModelPath);
+ // 加载 RSA 工具
+ RSAUtils utils = RSAUtils.getInstance(mContext);
+ KeyPair keyPair = utils.getOrGenerateKeys();
+ //PublicKey publicKey = keyPair.getPublic();
+ PrivateKey privateKey = keyPair.getPrivate();
+ // 私钥解密模型数据
+ String szInfo = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
+ LogUtils.d(TAG, String.format("szInfo %s", szInfo));
+ mUserInfoModel = UserInfoModel.parseStringToBean(szInfo, UserInfoModel.class);
+ if (mUserInfoModel == null) {
+ LogUtils.d(TAG, "模型数据解析为空数据。");
+ }
+ LogUtils.d(TAG, "UserInfoModel 解密加载结束。");
+ } catch (Exception e) {
+ LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+ }
+ } else {
+ LogUtils.d(TAG, "云服务登录信息不存在。");
+ mUserInfoModel = null;
+ }
+ return mUserInfoModel;
+ }
+
+ void saveUserInfoModel(UserInfoModel userInfoModel) {
+ LogUtils.d(TAG, "saveUserInfoModel");
+ try {
+ String szInfo = userInfoModel.toString();
+ LogUtils.d(TAG, "原始数据: " + szInfo);
+
+ RSAUtils utils = RSAUtils.getInstance(mContext);
+ KeyPair keyPair = utils.getOrGenerateKeys();
+ PublicKey publicKey = keyPair.getPublic();
+
+ // 公钥加密（传入字节数组，避免中间字符串转换）
+ byte[] encryptedData = utils.encryptWithPublicKey(szInfo, publicKey);
+
+ // 保存加密字节数组到文件（直接操作字节，无需转字符串）
+ FileUtils.writeByteArrayToFile(encryptedData, mUserInfoModelPath);
+ LogUtils.d(TAG, "加密数据已保存");
+
+ // 测试解密（仅调试用）
+ String szInfo2 = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
+ LogUtils.d(TAG, "解密结果: " + szInfo2);
+
+ mUserInfoModel = UserInfoModel.parseStringToBean(szInfo2, UserInfoModel.class);
+ if (mUserInfoModel == null) {
+ LogUtils.d(TAG, "模型解析失败");
+ }
+ } catch (Exception e) {
+ LogUtils.d(TAG, "加密/解密失败: " + e.getMessage());
+ }
+ }
+
+ // 发送 POST 请求（JSON 数据）
+ public void sendPostRequest(String url, String data, OnResponseListener listener) {
+ RequestBody requestBody = RequestBody.create(
+ MediaType.parse("application/json; charset=utf-8"), // 关键头信息
+ data.getBytes(StandardCharsets.UTF_8)
+ );
+
+ Request request = new Request.Builder()
+ .url(url)
+ .post(requestBody)
+ .addHeader("Content-Type", "application/json") // 显式添加头
+ .build();
+
+ executeRequest(request, listener);
+ }
+
+ // 发送 GET 请求
+ public void sendGetRequest(String url, OnResponseListener listener) {
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .build();
+ executeRequest(request, listener);
+ }
+
+ // 执行请求（子线程处理）
+ private void executeRequest(final Request request, final OnResponseListener listener) {
+ okHttpClient.newCall(request).enqueue(new Callback() {
+ // 响应成功（子线程）
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ try {
+ if (!response.isSuccessful()) {
+ postFailure(listener, "响应码错误：" + response.code());
+ return;
+ }
+ String responseBody = response.body().string();
+ postSuccess(listener, responseBody);
+ } catch (Exception e) {
+ postFailure(listener, "解析失败：" + e.getMessage());
+ }
+ }
+
+ // 响应失败（子线程）
+ @Override
+ public void onFailure(Call call, IOException e) {
+ postFailure(listener, "网络失败：" + e.getMessage());
+ }
+
+ // 主线程回调（使用 Handler）
+ private void postSuccess(final OnResponseListener listener, final String msg) {
+ mainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ listener.onSuccess(msg);
+ }
+ });
+ }
+
+ private void postFailure(final OnResponseListener listener, final String msg) {
+ mainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ listener.onFailure(msg);
+ }
+ });
+ }
+ });
+ }
+
+ public interface OnResponseListener {
+ /**
+ * 成功响应（主线程回调）
+ * @param responseBody 响应体字符串
+ */
+ void onSuccess(String responseBody);
+
+ /**
+ * 失败回调（包含错误信息）
+ * @param errorMsg 错误描述
+ */
+ void onFailure(String errorMsg);
+ }
+}
diff --git a/libappbase/src/main/res/layout/activity_logon.xml b/libappbase/src/main/res/layout/activity_logon.xml
new file mode 100644
index 00000000..2a2c2d16
--- /dev/null
+++ b/libappbase/src/main/res/layout/activity_logon.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libappbase/src/main/res/layout/activity_yun.xml b/libappbase/src/main/res/layout/activity_yun.xml
new file mode 100644
index 00000000..ac73fab4
--- /dev/null
+++ b/libappbase/src/main/res/layout/activity_yun.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libjc/build.properties b/libjc/build.properties
index 1be8de68..85fc83ca 100644
--- a/libjc/build.properties
+++ b/libjc/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Fri Jan 10 22:03:57 GMT 2025
+#Tue Jun 24 11:17:30 GMT 2025
stageCount=0
libraryProject=libjc
baseVersion=1.0
publishVersion=1.0.0
-buildCount=133
+buildCount=135
baseBetaVersion=1.0.1
diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/Main.java b/libjc/src/main/java/cc/winboll/studio/libjc/Main.java
index b362c568..9cf0d31d 100644
--- 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 enum JAR_RUNNING_MODE {
+ public static enum JAR_RUNNING_MODE {
UNKNOWN(JAR_RUNNING_MODE_UNKNOWN),
CONSOLE(JAR_RUNNING_MODE_CONSOLE),
CONSOLE_DEBUG(JAR_RUNNING_MODE_CONSOLE_DEBUG),
diff --git a/mymessagemanager/build.gradle b/mymessagemanager/build.gradle
index 32cbce1a..4dea4e58 100644
--- 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.2"
+ versionName "15.3"
if(true) {
versionName = genVersionName("${versionName}")
}
@@ -45,9 +45,9 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
- 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 'cc.winboll.studio:libaes:15.9.2'
+ api 'cc.winboll.studio:libapputils:15.8.4'
+ api 'cc.winboll.studio:libappbase:15.8.4'
api 'io.github.medyo:android-about-page:2.0.0'
api 'com.github.getActivity:ToastUtils:10.5'
diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties
index 3258555b..63e9af81 100644
--- a/mymessagemanager/build.properties
+++ b/mymessagemanager/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue May 20 20:39:06 HKT 2025
-stageCount=6
+#Thu Jul 03 13:50:15 HKT 2025
+stageCount=2
libraryProject=
-baseVersion=15.2
-publishVersion=15.2.5
+baseVersion=15.3
+publishVersion=15.3.1
buildCount=0
-baseBetaVersion=15.2.6
+baseBetaVersion=15.3.2
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java
index 739c9794..493076f4 100644
--- 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("APP");
+ appInfo.setAppGitName("APPBase");
appInfo.setAppGitOwner("Studio");
appInfo.setAppGitAPPBranch(szBranchName);
appInfo.setAppGitAPPSubProjectFolder(szBranchName);
- appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager");
+ appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=5&extra=page%3D1");
appInfo.setAppAPKName("MyMessageManager");
appInfo.setAppAPKFolderName("MyMessageManager");
return new AboutView(mContext, appInfo);
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java
index 066c3c8f..cca83b71 100644
--- 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,6 +103,9 @@ 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));
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java
index de3c9458..c5ec61c3 100644
--- 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,17 +269,9 @@ public class MainActivity extends BaseActivity {
public boolean onCreateOptionsMenu(Menu menu) {
//return super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.toolbar_main, menu);
-
- /*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);
+ super.onCreateOptionsMenu(menu);
+ getMenuInflater().inflate(R.menu.toolbar_main2, menu);
+ return true;
}
public static void reloadSMS() {
@@ -306,7 +298,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);
@@ -324,7 +316,7 @@ public class MainActivity extends BaseActivity {
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(i);
}
-
+
return super.onOptionsItemSelected(item);
}
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java
similarity index 93%
rename from mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java
rename to mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java
index 0a5ae35d..55c882ad 100644
--- 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;
diff --git a/mymessagemanager/src/main/res/layout/activity_unittest.xml b/mymessagemanager/src/main/res/layout/activity_unittest.xml
index 66c1835e..b37f8f15 100644
--- a/mymessagemanager/src/main/res/layout/activity_unittest.xml
+++ b/mymessagemanager/src/main/res/layout/activity_unittest.xml
@@ -34,7 +34,7 @@
-
- -
-
-
-