Compare commits

..

3 Commits

Author SHA1 Message Date
c9c95d6ab0 refactor(gradle): 强制项目使用Java 7语法并统一API适配范围
- build.gradle: subprojects Java版本从11降级为1.7
- libwinboll/build.gradle: minSdkVersion从21统一为26
- build.properties: 编译计数器自动递增(buildCount: 23→24)
2026-05-09 22:02:59 +08:00
bc9bd47daa 添加类库模块,便于调试类库编译配置。 2026-05-09 21:17:23 +08:00
4bec8c3e9e 忽略编译问题,暂缓新功能叠加。 2026-05-09 21:16:44 +08:00
22 changed files with 593 additions and 387 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat May 09 20:49:55 HKT 2026 #Tue Apr 28 17:08:30 HKT 2026
stageCount=23 stageCount=22
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.15 baseVersion=15.15
publishVersion=15.15.22 publishVersion=15.15.21
buildCount=0 buildCount=0
baseBetaVersion=15.15.23 baseBetaVersion=15.15.22

View File

@@ -96,8 +96,8 @@ allprojects {
// 1. 对纯 Java 模块的 JavaCompile 任务配置(升级为 Java 11 // 1. 对纯 Java 模块的 JavaCompile 任务配置(升级为 Java 11
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-parameters" options.compilerArgs << "-parameters"
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_1_7
// 可选:确保编码一致 // 可选:确保编码一致
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat May 09 20:49:55 HKT 2026 #Tue Apr 28 17:08:04 HKT 2026
stageCount=23 stageCount=22
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.15 baseVersion=15.15
publishVersion=15.15.22 publishVersion=15.15.21
buildCount=0 buildCount=0
baseBetaVersion=15.15.23 baseBetaVersion=15.15.22

1
libwinboll/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/build

34
libwinboll/build.gradle Normal file
View File

@@ -0,0 +1,34 @@
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'
api fileTree(dir: 'libs', include: ['*.jar'])
}

View File

@@ -0,0 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat May 09 21:21:56 CST 2026
stageCount=27
libraryProject=libwinboll
baseVersion=15.11
publishVersion=15.11.26
buildCount=24
baseBetaVersion=15.11.27

17
libwinboll/proguard-rules.pro vendored Normal file
View File

@@ -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 *;
#}

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cc.winboll.studio.libwinboll" >
<application>
<activity
android:name=".LibraryActivity"
android:label="@string/lib_name" >
</activity>
</application>
</manifest>

View File

@@ -0,0 +1,14 @@
package cc.winboll.studio.libwinboll;
import android.app.*;
import android.os.*;
public class LibraryActivity extends Activity
{
@Override
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.library);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -0,0 +1,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<TextView
android:text="@string/hello_world"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="@android:style/Theme.Material.Light">
</style>
</resources>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="lib_name">libwinboll</string>
<string name="hello_world">Hello world!</string>
</resources>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="@android:style/Theme.Holo.Light">
</style>
</resources>

View File

@@ -72,6 +72,7 @@
// WinBoLL 项目编译设置 // WinBoLL 项目编译设置
//include ':winboll' //include ':winboll'
//include ':libwinboll'
//rootProject.name = "winboll" //rootProject.name = "winboll"
// RegExpUtils 项目编译设置 // RegExpUtils 项目编译设置

View File

@@ -50,6 +50,7 @@ android {
} }
dependencies { dependencies {
api project(':libwinboll')
api 'com.google.code.gson:gson:2.10.1' api 'com.google.code.gson:gson:2.10.1'

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Wed May 06 13:39:52 CST 2026 #Sat May 09 21:21:56 CST 2026
stageCount=27 stageCount=27
libraryProject= libraryProject=libwinboll
baseVersion=15.11 baseVersion=15.11
publishVersion=15.11.26 publishVersion=15.11.26
buildCount=22 buildCount=24
baseBetaVersion=15.11.27 baseBetaVersion=15.11.27

View File

@@ -41,28 +41,29 @@ public class MainActivity extends DrawerFragmentActivity {
initMainHandler(); initMainHandler();
if (mBrowserFragment == null) { if (mBrowserFragment == null) {
String externalUrl = extractExternalUrl(getIntent()); LogUtils.d(TAG, "The code in this line is not fix yet.");
if (externalUrl != null) { // String externalUrl = extractExternalUrl(getIntent());
mBrowserFragment = BrowserFragment.newInstance(externalUrl); // if (externalUrl != null) {
} else { // mBrowserFragment = BrowserFragment.newInstance(externalUrl);
mBrowserFragment = new BrowserFragment(); // } else {
} // mBrowserFragment = new BrowserFragment();
addFragment(mBrowserFragment); // }
// addFragment(mBrowserFragment);
} }
showFragment(mBrowserFragment); showFragment(mBrowserFragment);
} }
@Override // @Override
protected void onNewIntent(Intent intent) { // protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); // super.onNewIntent(intent);
String externalUrl = extractExternalUrl(intent); // String externalUrl = extractExternalUrl(intent);
if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) { // if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
Message msg = Message.obtain(); // Message msg = Message.obtain();
msg.what = BrowserFragment.MSG_OPEN_URL; // msg.what = BrowserFragment.MSG_OPEN_URL;
msg.obj = externalUrl; // msg.obj = externalUrl;
mBrowserFragment.getBrowserHandler().sendMessage(msg); // mBrowserFragment.getBrowserHandler().sendMessage(msg);
} // }
} // }
private String extractExternalUrl(Intent intent) { private String extractExternalUrl(Intent intent) {
if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) { if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {