diff --git a/build.gradle b/build.gradle index 3effeb8..b592a79 100644 --- a/build.gradle +++ b/build.gradle @@ -96,8 +96,8 @@ allprojects { // 1. 对纯 Java 模块的 JavaCompile 任务配置（升级为 Java 11） tasks.withType(JavaCompile) { options.compilerArgs << "-parameters" - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 // 可选：确保编码一致 options.encoding = "UTF-8" } diff --git a/libwinboll/.gitignore b/libwinboll/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/libwinboll/.gitignore @@ -0,0 +1 @@ +/build diff --git a/libwinboll/build.gradle b/libwinboll/build.gradle new file mode 100644 index 0000000..11197ef --- /dev/null +++ b/libwinboll/build.gradle @@ -0,0 +1,38 @@ +apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply from: '../.winboll/winboll_lib_build.gradle' +apply from: '../.winboll/winboll_lint_build.gradle' + +android { + // 适配MIUI12 + compileSdkVersion 30 + buildToolsVersion "30.0.3" + + defaultConfig { + minSdkVersion 26 + targetSdkVersion 30 + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + // 网络连接类库 + api 'com.squareup.okhttp3:okhttp:4.4.1' + // Gson + api 'com.google.code.gson:gson:2.8.9' + // Html 解析 + api 'org.jsoup:jsoup:1.13.1' + // 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54） + api 'com.jcraft:jsch:0.1.54' + + // WinBoLL库 nexus.winboll.cc 地址 + api 'cc.winboll.studio:libaes:15.15.2' + api 'cc.winboll.studio:libappbase:15.15.11' + + api fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/libwinboll/build.properties b/libwinboll/build.properties new file mode 100644 index 0000000..cc26e5c --- /dev/null +++ b/libwinboll/build.properties @@ -0,0 +1,8 @@ +#Created by .winboll/winboll_app_build.gradle +#Sat May 09 19:01:46 GMT 2026 +stageCount=27 +libraryProject=libwinboll +baseVersion=15.11 +publishVersion=15.11.26 +buildCount=29 +baseBetaVersion=15.11.27 diff --git a/libwinboll/proguard-rules.pro b/libwinboll/proguard-rules.pro new file mode 100644 index 0000000..536058a --- /dev/null +++ b/libwinboll/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:/tools/adt-bundle-windows-x86_64-20131030/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/libwinboll/src/main/AndroidManifest.xml b/libwinboll/src/main/AndroidManifest.xml new file mode 100644 index 0000000..2323080 --- /dev/null +++ b/libwinboll/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java b/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java new file mode 100644 index 0000000..bb86ae9 --- /dev/null +++ b/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java @@ -0,0 +1,17 @@ +package cc.winboll.studio.libwinboll; + +import android.app.Activity; +import android.os.Bundle; +import cc.winboll.studio.libappbase.ToastUtils; + +public class WinBoLLLibraryActivity extends Activity +{ + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_winbolllibrary); + + ToastUtils.show("WinBoLLLibraryActivity onCreate"); + } +} diff --git a/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..96a442e Binary files /dev/null and b/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..359047d Binary files /dev/null and b/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..71c6d76 Binary files /dev/null and b/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..4df1894 Binary files /dev/null and b/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/libwinboll/src/main/res/layout/activity_winbolllibrary.xml b/libwinboll/src/main/res/layout/activity_winbolllibrary.xml new file mode 100644 index 0000000..97dc11a --- /dev/null +++ b/libwinboll/src/main/res/layout/activity_winbolllibrary.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/libwinboll/src/main/res/values-v21/styles.xml b/libwinboll/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..0948fdc --- /dev/null +++ b/libwinboll/src/main/res/values-v21/styles.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/libwinboll/src/main/res/values/strings.xml b/libwinboll/src/main/res/values/strings.xml new file mode 100644 index 0000000..b677aa6 --- /dev/null +++ b/libwinboll/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + + libwinboll + Hello world! + + diff --git a/libwinboll/src/main/res/values/styles.xml b/libwinboll/src/main/res/values/styles.xml new file mode 100644 index 0000000..8d78246 --- /dev/null +++ b/libwinboll/src/main/res/values/styles.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/settings.gradle-demo b/settings.gradle-demo index 893d3a6..6f4a53c 100644 --- a/settings.gradle-demo +++ b/settings.gradle-demo @@ -72,6 +72,7 @@ // WinBoLL 项目编译设置 //include ':winboll' +//include ':libwinboll' //rootProject.name = "winboll" // RegExpUtils 项目编译设置 diff --git a/winboll/build.gradle b/winboll/build.gradle index 46828ad..7cd3599 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -50,6 +50,7 @@ android { } dependencies { + api project(':libwinboll') api 'com.google.code.gson:gson:2.10.1' diff --git a/winboll/build.properties b/winboll/build.properties index c7c8cc1..cc26e5c 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 06 13:39:52 CST 2026 +#Sat May 09 19:01:46 GMT 2026 stageCount=27 -libraryProject= +libraryProject=libwinboll baseVersion=15.11 publishVersion=15.11.26 -buildCount=22 +buildCount=29 baseBetaVersion=15.11.27 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index e2a9402..e396b2e 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -41,28 +41,29 @@ public class MainActivity extends DrawerFragmentActivity { initMainHandler(); if (mBrowserFragment == null) { - String externalUrl = extractExternalUrl(getIntent()); - if (externalUrl != null) { - mBrowserFragment = BrowserFragment.newInstance(externalUrl); - } else { - mBrowserFragment = new BrowserFragment(); - } - addFragment(mBrowserFragment); + LogUtils.d(TAG, "The code in this line is not fix yet."); +// String externalUrl = extractExternalUrl(getIntent()); +// if (externalUrl != null) { +// mBrowserFragment = BrowserFragment.newInstance(externalUrl); +// } else { +// mBrowserFragment = new BrowserFragment(); +// } +// addFragment(mBrowserFragment); } showFragment(mBrowserFragment); } - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - String externalUrl = extractExternalUrl(intent); - if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) { - Message msg = Message.obtain(); - msg.what = BrowserFragment.MSG_OPEN_URL; - msg.obj = externalUrl; - mBrowserFragment.getBrowserHandler().sendMessage(msg); - } - } +// @Override +// protected void onNewIntent(Intent intent) { +// super.onNewIntent(intent); +// String externalUrl = extractExternalUrl(intent); +// if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) { +// Message msg = Message.obtain(); +// msg.what = BrowserFragment.MSG_OPEN_URL; +// msg.obj = externalUrl; +// mBrowserFragment.getBrowserHandler().sendMessage(msg); +// } +// } private String extractExternalUrl(Intent intent) { if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) { @@ -191,6 +192,10 @@ public class MainActivity extends DrawerFragmentActivity { } else if (nItemId == R.id.item_termux_env_test) { Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); + } else if (nItemId == R.id.item_library_activity) { + Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); } else { return super.onOptionsItemSelected(item); diff --git a/winboll/src/main/res/menu/toolbar_test.xml b/winboll/src/main/res/menu/toolbar_test.xml index bb3b59a..ccd0574 100644 --- a/winboll/src/main/res/menu/toolbar_test.xml +++ b/winboll/src/main/res/menu/toolbar_test.xml @@ -7,6 +7,9 @@ +