Studio/WinBoLL
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

更新类库

Browse Source
This commit is contained in:
ZhangShaojian
2026-05-24 11:08:06 +08:00
parent 71e6f1f03f
commit 79eb4e3247
14 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
.winboll/winboll_app_build.gradle
View File

@@ -122,7 +122,6 @@ android {
// 如果正在调试，就拷贝到 WinBoLL 备份管理文件夹 // 如果正在调试，就拷贝到 WinBoLL 备份管理文件夹
// //
if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){ if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){
//File outBuildBckDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/${variant.buildType.name}")
File outBuildBckDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}") File outBuildBckDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}")
// 创建目标路径目录 // 创建目标路径目录
if(!outBuildBckDir.exists()) { if(!outBuildBckDir.exists()) {
@@ -130,6 +129,7 @@ android {
println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath() println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
} }
if(outBuildBckDir.exists()) { if(outBuildBckDir.exists()) {
def targetApkFile = new File(outBuildBckDir, outputFileName)
copy{ copy{
from file.outputFile from file.outputFile
into outBuildBckDir into outBuildBckDir
@@ -138,6 +138,14 @@ android {
} }
println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}" println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
} }
// ========== 设置文件权限为775 ==========
if(targetApkFile.exists()){
exec {
commandLine 'chmod', '775', targetApkFile.absolutePath
}
println "Set file permission to 775 : ${targetApkFile.absolutePath}"
}
// 检查编译标志位配置 // 检查编译标志位配置
assert (winbollBuildProps['buildCount'] != null) assert (winbollBuildProps['buildCount'] != null)
assert (winbollBuildProps['libraryProject'] != null) assert (winbollBuildProps['libraryProject'] != null)
@@ -160,8 +168,7 @@ android {
assert(libraryProjectBuildPropsFile.exists()) assert(libraryProjectBuildPropsFile.exists())
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath(); java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath(); java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
// 使用copyTo()方法复制文件，如果目标文件存在会被覆盖，可选参数可以选择不覆盖 java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
println "\n\n>>> Library Project build.properties saved.\n\n"; println "\n\n>>> Library Project build.properties saved.\n\n";
} }
@@ -172,16 +179,12 @@ android {
// //
if(variant.flavorName == "stage"&&variant.buildType.name == "release"){ if(variant.flavorName == "stage"&&variant.buildType.name == "release"){
// 发布 APK 文件 // 发布 APK 文件
//
// 截取版本号的版本字段为短版本名
String szVersionName = "${versionName}" String szVersionName = "${versionName}"
String[] szlistTemp = szVersionName.split("-") String[] szlistTemp = szVersionName.split("-")
String szShortVersionName = szlistTemp[0] String szShortVersionName = szlistTemp[0]
//String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk" String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
println "CommonTagAPKName is : " + szCommonTagAPKName println "CommonTagAPKName is : " + szCommonTagAPKName
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/") File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/")
// 创建目标路径目录 // 创建目标路径目录
if(!outTagDir.exists()) { if(!outTagDir.exists()) {
@@ -192,12 +195,10 @@ android {
if(outTagDir.exists()) { if(outTagDir.exists()) {
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}") File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
if(targetAPK.exists()) { if(targetAPK.exists()) {
// 标签版本APK文件已经存在，构建拷贝任务停止
assert (!targetAPK.exists()) assert (!targetAPK.exists())
// 可选择删除并继续输出APK文件
//delete targetAPK
} }
// 复制一个备份 // 复制完整版APK
def fullApkFile = new File(outTagDir, outputFileName)
copy{ copy{
from file.outputFile from file.outputFile
into outTagDir into outTagDir
@@ -206,7 +207,16 @@ android {
} }
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}" println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
} }
// 复制一个并重命名为短版本名 // 设置权限775
if(fullApkFile.exists()){
exec {
commandLine 'chmod', '775', fullApkFile.absolutePath
}
println "Set file permission to 775 : ${fullApkFile.absolutePath}"
}
// 复制短版本名APK
def shortApkFile = new File(outTagDir, szCommonTagAPKName)
copy{ copy{
from file.outputFile from file.outputFile
into outTagDir into outTagDir
@@ -215,6 +225,14 @@ android {
} }
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}" println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
} }
// 设置权限775
if(shortApkFile.exists()){
exec {
commandLine 'chmod', '775', shortApkFile.absolutePath
}
println "Set file permission to 775 : ${shortApkFile.absolutePath}"
}
// 检查编译标志位配置 // 检查编译标志位配置
assert (winbollBuildProps['stageCount'] != null) assert (winbollBuildProps['stageCount'] != null)
assert (winbollBuildProps['publishVersion'] != null) assert (winbollBuildProps['publishVersion'] != null)
@@ -239,14 +257,11 @@ android {
fos.close(); fos.close();
if(winbollBuildProps['libraryProject'] != "") { if(winbollBuildProps['libraryProject'] != "") {
// 如果应用 build.properties 文件设置了类库模块项目文件名
// 就拷贝一份新的编译标志配置到类库项目文件夹
File libraryProjectBuildPropsFile = new File("$RootProjectDir/" + winbollBuildProps['libraryProject'] + "/build.properties") File libraryProjectBuildPropsFile = new File("$RootProjectDir/" + winbollBuildProps['libraryProject'] + "/build.properties")
assert(winbollBuildPropsFile.exists()) assert(winbollBuildPropsFile.exists())
assert(libraryProjectBuildPropsFile.exists()) assert(libraryProjectBuildPropsFile.exists())
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath(); java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath(); java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
// 使用copyTo()方法复制文件，如果目标文件存在会被覆盖，可选参数可以选择不覆盖
java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING); java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
} }
@@ -263,17 +278,12 @@ android {
// 如果正在调试发布版，就只生成和输出APK文件，不处理 Git 仓库提交与更新问题。 // 如果正在调试发布版，就只生成和输出APK文件，不处理 Git 仓库提交与更新问题。
// //
if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){ if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){
// 发布 APK 文件
//
// 截取版本号的版本字段为短版本名
String szVersionName = "${versionName}" String szVersionName = "${versionName}"
String[] szlistTemp = szVersionName.split("-") String[] szlistTemp = szVersionName.split("-")
String szShortVersionName = szlistTemp[0] String szShortVersionName = szlistTemp[0]
//String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk" String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
println "CommonTagAPKName is : " + szCommonTagAPKName println "CommonTagAPKName is : " + szCommonTagAPKName
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}/") File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}/")
// 创建目标路径目录 // 创建目标路径目录
if(!outTagDir.exists()) { if(!outTagDir.exists()) {
@@ -284,13 +294,11 @@ android {
if(outTagDir.exists()) { if(outTagDir.exists()) {
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}") File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
if(targetAPK.exists()) { if(targetAPK.exists()) {
// 标签版本APK文件已经存在，构建拷贝任务停止
println '如果是在调试 Stage 版应用包构建，请删除(注：在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。' println '如果是在调试 Stage 版应用包构建，请删除(注：在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。'
assert (!targetAPK.exists()) assert (!targetAPK.exists())
// 可选择删除并继续输出APK文件
//delete targetAPK
} }
// 复制一个备份 // 复制完整版APK
def debugFullApk = new File(outTagDir, outputFileName)
copy{ copy{
from file.outputFile from file.outputFile
into outTagDir into outTagDir
@@ -299,7 +307,16 @@ android {
} }
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}" println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
} }
// 复制一个并重命名为短版本名 // 权限设为775
if(debugFullApk.exists()){
exec {
commandLine 'chmod', '775', debugFullApk.absolutePath
}
println "Set file permission to 775 : ${debugFullApk.absolutePath}"
}
// 复制短版本名APK
def debugShortApk = new File(outTagDir, szCommonTagAPKName)
copy{ copy{
from file.outputFile from file.outputFile
into outTagDir into outTagDir
@@ -308,8 +325,13 @@ android {
} }
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}" println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
} }
// 权限设为775
//不保存编译标志配置 if(debugShortApk.exists()){
exec {
commandLine 'chmod', '775', debugShortApk.absolutePath
}
println "Set file permission to 775 : ${debugShortApk.absolutePath}"
}
} }
} }
@@ -328,6 +350,13 @@ android {
} }
println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}" println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
} }
// 额外输出文件设置775权限
if(apkFile.exists()){
exec {
commandLine 'chmod', '775', apkFile.absolutePath
}
println "Set file permission to 775 : ${apkFile.absolutePath}"
}
} }
} }

8
libwinboll/build.gradle
View File

@@ -44,12 +44,12 @@ dependencies {
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
// WinBoLL库 nexus.winboll.cc 地址 // WinBoLL库 nexus.winboll.cc 地址
//api 'cc.winboll.studio:libappbase:15.20.20' api 'cc.winboll.studio:libappbase:15.20.21'
//api 'cc.winboll.studio:libaes:15.20.8' api 'cc.winboll.studio:libaes:15.20.9'
// 备用库 jitpack.io 地址 // 备用库 jitpack.io 地址
api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20' //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20'
api 'com.github.ZhanGSKen:libaes:aes-v15.20.8' //api 'com.github.ZhanGSKen:libaes:aes-v15.20.8'
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])

8
winboll/build.gradle
View File

@@ -105,12 +105,12 @@ dependencies {
implementation 'com.termux:termux-shared:0.118.0' implementation 'com.termux:termux-shared:0.118.0'
// WinBoLL库 nexus.winboll.cc 地址 // WinBoLL库 nexus.winboll.cc 地址
//api 'cc.winboll.studio:libappbase:15.20.20' api 'cc.winboll.studio:libappbase:15.20.21'
//api 'cc.winboll.studio:libaes:15.20.8' api 'cc.winboll.studio:libaes:15.20.9'
// 备用库 jitpack.io 地址 // 备用库 jitpack.io 地址
api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20' //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.21'
api 'com.github.ZhanGSKen:libaes:aes-v15.20.8' //api 'com.github.ZhanGSKen:libaes:aes-v15.20.9'
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
} }

2
winboll/build.properties
View File

@@ -1,5 +1,5 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Wed May 20 12:19:48 GMT 2026 #Sun May 24 03:03:18 GMT 2026
stageCount=2 stageCount=2
libraryProject=libwinboll libraryProject=libwinboll
baseVersion=15.20 baseVersion=15.20

2
winboll/src/main/java/cc/winboll/studio/winboll/models/MainServiceBean.java
View File

@@ -6,7 +6,7 @@ package cc.winboll.studio.winboll.models;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class MainServiceBean extends BaseBean { public class MainServiceBean extends BaseBean {

3
winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java
View File

@@ -1,7 +1,8 @@
package cc.winboll.studio.winboll.models; package cc.winboll.studio.winboll.models;
import android.content.Context; import android.content.Context;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import cc.winboll.studio.winboll.models.TermuxButtonModel;
import java.util.ArrayList; import java.util.ArrayList;
public class TermuxButtonManager { public class TermuxButtonManager {

2
winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonModel.java
View File

@@ -2,7 +2,7 @@ package cc.winboll.studio.winboll.models;
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
/** /**

2
winboll/src/main/java/cc/winboll/studio/winboll/models/TestDemoBindServiceBean.java
View File

@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class TestDemoBindServiceBean extends BaseBean { public class TestDemoBindServiceBean extends BaseBean {

2
winboll/src/main/java/cc/winboll/studio/winboll/models/TestDemoServiceBean.java
View File

@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class TestDemoServiceBean extends BaseBean { public class TestDemoServiceBean extends BaseBean {

2
winboll/src/main/java/cc/winboll/studio/winboll/models/UserInfoModel.java
View File

@@ -6,7 +6,7 @@ package cc.winboll.studio.winboll.models;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class UserInfoModel extends BaseBean { public class UserInfoModel extends BaseBean {

4
winboll/src/main/java/cc/winboll/studio/winboll/models/WinBoLLModel.java
View File

@@ -7,9 +7,9 @@ package cc.winboll.studio.winboll.models;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean;
import java.io.IOException;
import cc.winboll.studio.libappbase.APPModel; import cc.winboll.studio.libappbase.APPModel;
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException;
public class WinBoLLModel extends BaseBean { public class WinBoLLModel extends BaseBean {

2
winboll/src/main/java/cc/winboll/studio/winboll/models/WinBoLLNewsBean.java
View File

@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class WinBoLLNewsBean extends BaseBean { public class WinBoLLNewsBean extends BaseBean {

2
winboll/src/main/java/cc/winboll/studio/winboll/sos/SOSCenterServiceModel.java
View File

@@ -8,7 +8,7 @@ package cc.winboll.studio.winboll.sos;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class SOSCenterServiceModel extends BaseBean { public class SOSCenterServiceModel extends BaseBean {

2
winboll/src/main/java/cc/winboll/studio/winboll/sos/SOSObject.java
View File

@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.sos;
*/ */
import android.util.JsonReader; import android.util.JsonReader;
import android.util.JsonWriter; import android.util.JsonWriter;
import cc.winboll.studio.libappbase.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
public class SOSObject extends BaseBean { public class SOSObject extends BaseBean {