Merge pull request #1 from Xigong93/dev-v1.1.0

Dev v1.1.0

Author: Xigong93

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,29 +1,56 @@
-# 一款快速更新Apk到安卓应用市场的工具
 
-## 功能特点：
 
-1. 使用应用市场提供的Api传包功能，安全，稳定，快速
-2. 代码开源
-3. 完全免费
-4. 使用kotlin 编写，支持Windows 和Mac OS
+# 小篆传包 <img src="./img/icon.png" alt="图标" style="with:40px; height:40px"/>
 
-## 技术特点：
+一键上传Apk到多个应用市场，开源，免费
 
-1. 使用compose desktop 开发
-2. Ant design 设计风格
+<a href="./doc/ENGLISH.md">English README</a>
 
-## 应用市场Api传包文档地址
+## 应用界面截图
 
-- 华为 https://developer.huawei.com/consumer/cn/doc/AppGallery-connect-Guides/agcapi-updateappinfo-0000001158245317
-- 小米 https://dev.mi.com/distribute/doc/details?pId=1134
-- OPPO https://open.oppomobile.com/new/developmentDoc/info?id=10998
-- VIVO https://dev.vivo.com.cn/documentCenter/doc/327
-- 荣耀 https://developer.honor.com/cn/doc/guides/101359
+### 1. 首页
+<img src="./img/home.png" style="border:2px solid #f4f4f4;border-radius:10px"/>
 
-## 应用市场Api传包参数获取指引
+### 2. 提交新版本页面
+<img src="./img/submit.png" style="border:2px solid #f4f4f4;border-radius:10px"/>
 
-- 华为
-- 小米
-- OPPO
-- VIVO
-- 荣耀 
+### 3. 新增APP页面
+<img src="./img/add.png"  style="border:2px solid #f4f4f4;border-radius:10px"/>
+<img src="./img/huawei.png"  style="border:2px solid #f4f4f4;border-radius:10px"/>
+
+## 特点：
+
+1. 使用应用市场提供的Api传包功能，安全，稳定，快捷
+2. 代码开源，完全免费，不会向第三方上传任何相关账号信息
+3. 基于Compose Desktop 开发，支持Windows 和Mac OS
+
+
+## 如何使用
+<a href="./doc/Instructions.md">点击这里查看功能文档</a>
+
+
+## 安装包下载
+<a href="https://gitee.com/xigong93/XiaoZhuan/release">从Gitee下载(推荐)</a>
+
+<a href="https://github.com/xigong93/XiaoZhuan/release">从Github下载</a>
+
+## 功能限制
+
+1. 仅支持华为、小米、OPPO、VIVO、荣耀 5个应用市场
+2. 仅支持32位和64位合并版包，暂不支持分包上传
+3. 仅支持更新已上架的APP，不支持新增APP
+
+## 自己编译
+<a href="./doc/Develop.md">请点击这里查看开发文档</a>
+
+## 常见问题的解决
+
+<a href="./doc/TroubleShotting.md">点击这里查看常见问题</a>
+
+
+## 已知问题
+1. 小米的传包Api不显示当前审核的版本，只返回线上的最新版本
+
+2. OPPO 提交新版本后，有几分钟的延迟，过几分钟后才会显示新版本正在审核中
+
+3. VIVO应用市场获取应用审核状态，有时候会报错，原因是此接口限制请求频率，每分钟不得超过3次

build.gradle.kts

@@ -5,9 +5,10 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-group = "xigong"
-version = "1.0-SNAPSHOT"
-
+val packageId = "com.xigong.xiaozhuan"
+val appVersion = AppVersion(1, 1, 0)
+val appName = "小篆传包"
+println("当前版本:v${appVersion.versionName} (${appVersion.versionCode})")
 repositories {
 //    maven("https://maven.aliyun.com/repository/public")
     google()
@@ -27,6 +28,11 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0")
     implementation("org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha02")
+    // Enables FileKit without Compose dependencies
+    implementation("io.github.vinceglb:filekit-core:0.6.2")
+
+    // Enables FileKit with Composable utilities
+    implementation("io.github.vinceglb:filekit-compose:0.6.2")
 
 }
 
@@ -43,16 +49,64 @@ compose.desktop {
     application {
         mainClass = "MainKt"
         buildTypes {
-            jvmArgs("-DbuildType=debug")
             release {
                 proguard.isEnabled = false
-                jvmArgs("-DbuildType=release")
             }
         }
         nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "ApkDispatcher"
-            packageVersion = "1.0.0"
+            targetFormats(TargetFormat.Msi, TargetFormat.Dmg)
+            outputBaseDir.set(project.buildDir.resolve("packages"))
+            includeAllModules = true
+            packageName = appName
+            description = "一键上传Apk到多个应用市场，开源，免费"
+            copyright = "© 2024 Xigong"
+            vendor = "Xigong"
+            packageVersion = appVersion.versionName
+
+            windows {
+                // 生成桌面快捷方式
+                shortcut = true
+                // 设置图标
+                iconFile.set(project.file("launcher/icon.ico"))
+
+                upgradeUuid = "c5dd9f2e-9e6b-4899-867e-a980924c8962"
+                // 自定义安装目录的名称，不设置的话，会使用中文
+                installationPath = "./XiaoZhuan"
+            }
+            macOS {
+                iconFile.set(project.file("launcher/icon.icns"))
+                installationPath = "./XiaoZhuan"
+            }
         }
     }
 }
+
+
+tasks.named("processResources") {
+    doLast {
+        val dir = outputs.files.first()
+        val file = File(dir, "BuildConfig.json")
+        val tasks = gradle.taskGraph.allTasks
+        val release = tasks.any { it.name.startsWith("package") }
+        writeBuildConfig(file, release)
+    }
+}
+
+
+/**
+ * 生成BuildConfig配置文件
+ */
+fun writeBuildConfig(file: File, release: Boolean) {
+    val type = if (release) "release" else "debug"
+    println("Write $type BuildConfig.json to  ${file.absolutePath}")
+    val name = if (release) appName else "${appName}(测试)"
+    val buildConfig = BuildConfig(
+        versionCode = appVersion.versionCode.toLong(),
+        versionName = appVersion.versionName,
+        packageId = packageId,
+        appName = name,
+        release = release
+    )
+    file.writeText(buildConfig.toJson())
+}
+

buildSrc/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+repositories {
+    maven("https://maven.aliyun.com/repository/gradle-plugin")
+    gradlePluginPortal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation(gradleApi())
+    implementation("com.google.code.gson:gson:2.8.6")
+}