Merge branch 'appbase' into winboll
This commit is contained in:
		@@ -75,9 +75,9 @@ android {
 | 
				
			|||||||
            def outputFileName=project.rootDir.name + "_${versionName}.apk"
 | 
					            def outputFileName=project.rootDir.name + "_${versionName}.apk"
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
            // 创建 WinBoll Studio 发布接口文件夹
 | 
					            // 创建 WinBoll Studio 发布接口文件夹
 | 
				
			||||||
            File fWinBollStudioDir = file("/sdcard/WinBollStudio/APKs");
 | 
					            File fWinBoLLStudioDir = file("/sdcard/WinBoLLStudio/APKs");
 | 
				
			||||||
            if(!fWinBollStudioDir.exists()) {
 | 
					            if(!fWinBoLLStudioDir.exists()) {
 | 
				
			||||||
                //fWinBollStudioDir.mkdirs();
 | 
					                //fWinBoLLStudioDir.mkdirs();
 | 
				
			||||||
                // 如果没有发布接口文件就不用进行APK发布和源码管理操作
 | 
					                // 如果没有发布接口文件就不用进行APK发布和源码管理操作
 | 
				
			||||||
                // 当前编译环境不是 WinBoll 主机, 以下将忽略APK发布和源码管理操作。
 | 
					                // 当前编译环境不是 WinBoll 主机, 以下将忽略APK发布和源码管理操作。
 | 
				
			||||||
                println 'The current compilation environment is not in WinBoll host, and the following APK publishing and source management operations will be ignore.'
 | 
					                println 'The current compilation environment is not in WinBoll host, and the following APK publishing and source management operations will be ignore.'
 | 
				
			||||||
@@ -94,12 +94,12 @@ 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, "/${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()) {
 | 
				
			||||||
                                    outBuildBckDir.mkdirs();
 | 
					                                    outBuildBckDir.mkdirs();
 | 
				
			||||||
                                    println "Output Folder Created.(WinBollStudio) : " + outBuildBckDir.getAbsolutePath()
 | 
					                                    println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
 | 
				
			||||||
                                }
 | 
					                                }
 | 
				
			||||||
                                if(outBuildBckDir.exists()) {
 | 
					                                if(outBuildBckDir.exists()) {
 | 
				
			||||||
                                    copy{
 | 
					                                    copy{
 | 
				
			||||||
@@ -108,7 +108,7 @@ android {
 | 
				
			|||||||
                                        rename {
 | 
					                                        rename {
 | 
				
			||||||
                                            String fileName -> "${outputFileName}"
 | 
					                                            String fileName -> "${outputFileName}"
 | 
				
			||||||
                                        }
 | 
					                                        }
 | 
				
			||||||
                                        println "Output APK (WinBollStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
 | 
					                                        println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
 | 
				
			||||||
                                    }
 | 
					                                    }
 | 
				
			||||||
                                    // 检查编译标志位配置
 | 
					                                    // 检查编译标志位配置
 | 
				
			||||||
                                    assert (winbollBuildProps['buildCount'] != null)
 | 
					                                    assert (winbollBuildProps['buildCount'] != null)
 | 
				
			||||||
@@ -151,8 +151,8 @@ android {
 | 
				
			|||||||
                                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, "/${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()) {
 | 
				
			||||||
                                    outTagDir.mkdirs();
 | 
					                                    outTagDir.mkdirs();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,7 @@ def DefaultGroupId = 'cc.winboll.studio' // 类库所有者groupId
 | 
				
			|||||||
def DefaultVersion = getDefaultVersion() // 版本号
 | 
					def DefaultVersion = getDefaultVersion() // 版本号
 | 
				
			||||||
def DeveloperId='zhangsken' // 开发者账号
 | 
					def DeveloperId='zhangsken' // 开发者账号
 | 
				
			||||||
def DeveloperName='ZhanGSKen' // 开发者名称
 | 
					def DeveloperName='ZhanGSKen' // 开发者名称
 | 
				
			||||||
def DeveloperEMail='ZhanGSKen@QQ.COM' // 开发者邮箱地址
 | 
					def DeveloperEMail='zhangsken@188.com' // 开发者邮箱地址
 | 
				
			||||||
def LicenseName='The Apache Software License, Version 2.0'
 | 
					def LicenseName='The Apache Software License, Version 2.0'
 | 
				
			||||||
def LicenseUrl='http://www.apache.org/licenses/LICENSE-2.0.txt'
 | 
					def LicenseUrl='http://www.apache.org/licenses/LICENSE-2.0.txt'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -92,7 +92,12 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
### ☁ 云游四方 ☁ ###
 | 
					### ☁ 云游四方 ☁ ###
 | 
				
			||||||
### ☁ 呔! ☁ WinBoll-APP 应用需求规划
 | 
					### ☁ 呔! ☁ WinBoll-APP 应用需求规划
 | 
				
			||||||
☁ WinBoll-APP 提供手机目录 /sdcard/WinBollStudio/Sources 的 WinBoll 项目源码管理功能。 
 | 
					☁ 如要使用 WinBoLL Android 项目的 Gradle 编译功能,则需要设置以下两个文件夹。
 | 
				
			||||||
 | 
					☁ 1. 则需要建立数据存储目录 /sdcard/WinBoLLStudio/APKs。
 | 
				
			||||||
 | 
					   WinBoLL 项目源码编译出来的安装包会拷贝一份到 /sdcard/WinBoLLStudio/APKs 目录下。 
 | 
				
			||||||
 | 
					☁ 2. 则需要建立数据存储目录 /sdcard/AppProjects。
 | 
				
			||||||
 | 
					   WinBoLL 项目源码编译出来的安装包会拷贝一份并命名 "app.apk" 的安装文件为到 /sdcard/AppProjects 目录下。 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### ☁ 吁! ☁ WinBoll-APP 共享计划前景
 | 
					### ☁ 吁! ☁ WinBoll-APP 共享计划前景
 | 
				
			||||||
☁ WinBoll-APP 将会实现 https://winboll.cc/api 访问功能。
 | 
					☁ WinBoll-APP 将会实现 https://winboll.cc/api 访问功能。
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
#Created by .winboll/winboll_app_build.gradle
 | 
					#Created by .winboll/winboll_app_build.gradle
 | 
				
			||||||
#Sat Apr 12 15:06:52 HKT 2025
 | 
					#Sat Apr 26 12:27:57 GMT 2025
 | 
				
			||||||
stageCount=6
 | 
					stageCount=6
 | 
				
			||||||
libraryProject=libappbase
 | 
					libraryProject=libappbase
 | 
				
			||||||
baseVersion=15.2
 | 
					baseVersion=15.2
 | 
				
			||||||
publishVersion=15.2.5
 | 
					publishVersion=15.2.5
 | 
				
			||||||
buildCount=0
 | 
					buildCount=4
 | 
				
			||||||
baseBetaVersion=15.2.6
 | 
					baseBetaVersion=15.2.6
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,7 +65,8 @@ allprojects {
 | 
				
			|||||||
        bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
 | 
					        bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        winbollFilePath = "winboll.properties"
 | 
					        winbollFilePath = "winboll.properties"
 | 
				
			||||||
        keyPropsFilePath = "winboll-x/current.keystore"
 | 
					        //keyPropsFilePath = "winboll-x/current.keystore"
 | 
				
			||||||
 | 
					        keyPropsFilePath = "current.keystore"
 | 
				
			||||||
        // 定义 lint 输出文件
 | 
					        // 定义 lint 输出文件
 | 
				
			||||||
        lintXmlReportFilePath = "build/reports/lint-results.xml"
 | 
					        lintXmlReportFilePath = "build/reports/lint-results.xml"
 | 
				
			||||||
        lintHTMLReportFilePath = "build/reports/lint-results.html"
 | 
					        lintHTMLReportFilePath = "build/reports/lint-results.html"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								current.keystore-demo
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								current.keystore-demo
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					keyAlias=WinBoLL.CC
 | 
				
			||||||
 | 
					keyPassword=androiddebugkey
 | 
				
			||||||
 | 
					storeFile=../WinBoLL.CC.jks
 | 
				
			||||||
 | 
					storePassword=androiddebugkey
 | 
				
			||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
#Created by .winboll/winboll_app_build.gradle
 | 
					#Created by .winboll/winboll_app_build.gradle
 | 
				
			||||||
#Sat Apr 12 15:06:52 HKT 2025
 | 
					#Sat Apr 26 12:27:57 GMT 2025
 | 
				
			||||||
stageCount=6
 | 
					stageCount=6
 | 
				
			||||||
libraryProject=libappbase
 | 
					libraryProject=libappbase
 | 
				
			||||||
baseVersion=15.2
 | 
					baseVersion=15.2
 | 
				
			||||||
publishVersion=15.2.5
 | 
					publishVersion=15.2.5
 | 
				
			||||||
buildCount=0
 | 
					buildCount=4
 | 
				
			||||||
baseBetaVersion=15.2.6
 | 
					baseBetaVersion=15.2.6
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user