From 8f781dfade233409657c1959a70c07080f4f0f24 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Thu, 21 Dec 2023 15:21:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=20uni-upgrade-center?=
 =?UTF-8?q?-app=E3=80=81uts-progressNotification=20=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-upgrade-center-app/changelog.md       |  2 +
 .../uni-upgrade-center-app/package.json       |  4 +-
 .../pages/upgrade-popup.vue                   |  8 +-
 .../uts-progressNotification/changelog.md     |  2 +
 .../uts-progressNotification/package.json     |  2 +-
 .../utssdk/app-ios/config.json                |  3 -
 .../utssdk/app-ios/index.uts                  | 85 -------------------
 7 files changed, 12 insertions(+), 94 deletions(-)
 delete mode 100644 uni_modules/uts-progressNotification/utssdk/app-ios/config.json
 delete mode 100644 uni_modules/uts-progressNotification/utssdk/app-ios/index.uts

diff --git a/uni_modules/uni-upgrade-center-app/changelog.md b/uni_modules/uni-upgrade-center-app/changelog.md
index ae79e92c..eba9aed3 100644
--- a/uni_modules/uni-upgrade-center-app/changelog.md
+++ b/uni_modules/uni-upgrade-center-app/changelog.md
@@ -1,3 +1,5 @@
+## 0.7.6（2023-12-21）
+- 修复 iOS使用升级中心云打包时报错（使用新版的 [uts-progressNotification](https://ext.dcloud.net.cn/plugin?name=uts-progressNotification) 插件，如果之前下载过请删除 `uts-progressNotification\utssdk\app-ios` 文件夹）
 ## 0.7.5（2023-12-12）
 - 新增 通知栏进度条使用 uts-progressNotification 插件
 - 新增 依赖 uni-installApk、uts-progressNotification。使用前要安装插件三方依赖
diff --git a/uni_modules/uni-upgrade-center-app/package.json b/uni_modules/uni-upgrade-center-app/package.json
index 5fd22e55..046d4f7c 100644
--- a/uni_modules/uni-upgrade-center-app/package.json
+++ b/uni_modules/uni-upgrade-center-app/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-upgrade-center-app",
   "displayName": "升级中心 uni-upgrade-center - App",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "uni升级中心 - 客户端检查更新",
   "keywords": [
     "uniCloud",
@@ -11,7 +11,7 @@
 ],
   "repository": "https://gitee.com/dcloud/uni-upgrade-center/tree/master/uni_modules/uni-upgrade-center-app",
   "engines": {
-    "HBuilderX": "^3.2.14"
+    "HBuilderX": "^3.97"
   },
 "dcloudext": {
     "sale": {
diff --git a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
index dda288cc..4cfdaf10 100644
--- a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
+++ b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
@@ -64,7 +64,9 @@
 </template>
 
 <script>
+	// #ifdef APP
   import { createNotificationProgress, cancelNotificationProgress, finishNotificationProgress } from '@/uni_modules/uts-progressNotification'
+	// #endif
 	const localFilePathKey = 'UNI_ADMIN_UPGRADE_CENTER_LOCAL_FILE_PATH'
 	const platform_iOS = 'iOS';
 	const platform_Android = 'Android';
@@ -187,16 +189,16 @@
 				return this.type === 'wgt'
 			},
 			isiOS() {
-				return !this.isWGT ? this.platform.includes(platform_iOS) : false;
+				return !this.isWGT ? this.platform.indexOf(platform_iOS) !== -1 : false;
 			},
 			isAndroid() {
-				return this.platform.includes(platform_Android)
+				return this.platform.indexOf(platform_Android) !== -1
 			},
 			isAppStore() {
 				return this.isiOS || (!this.isiOS && !this.isWGT && this.url.indexOf('.apk') === -1)
 			},
 			needNotificationProgress() {
-				return this.isAndroid && !this.is_mandatory
+				return this.platform.indexOf(platform_iOS) === -1 && !this.is_mandatory
 			}
 		},
 		methods: {
diff --git a/uni_modules/uts-progressNotification/changelog.md b/uni_modules/uts-progressNotification/changelog.md
index 33247047..ea934510 100644
--- a/uni_modules/uts-progressNotification/changelog.md
+++ b/uni_modules/uts-progressNotification/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.8（2023-12-21）
+去除app-ios目录
 ## 1.0.7（2023-12-11）
 去除无用代码
 ## 1.0.6（2023-12-11）
diff --git a/uni_modules/uts-progressNotification/package.json b/uni_modules/uts-progressNotification/package.json
index 09e67099..418d1979 100644
--- a/uni_modules/uts-progressNotification/package.json
+++ b/uni_modules/uts-progressNotification/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uts-progressNotification",
   "displayName": "uts-progressNotification",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "uts-progressNotification",
   "keywords": [
     "uts-progressNotification"
diff --git a/uni_modules/uts-progressNotification/utssdk/app-ios/config.json b/uni_modules/uts-progressNotification/utssdk/app-ios/config.json
deleted file mode 100644
index 721b81e0..00000000
--- a/uni_modules/uts-progressNotification/utssdk/app-ios/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "deploymentTarget": "9"
-}
\ No newline at end of file
diff --git a/uni_modules/uts-progressNotification/utssdk/app-ios/index.uts b/uni_modules/uts-progressNotification/utssdk/app-ios/index.uts
deleted file mode 100644
index c24f8c2c..00000000
--- a/uni_modules/uts-progressNotification/utssdk/app-ios/index.uts
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * 引用 iOS 系统库，示例如下：
- * import { UIDevice } from "UIKit";
- * [可选实现，按需引入]
- */
-
-/* 引入 interface.uts 文件中定义的变量 */
-import { MyApiOptions, MyApiResult, MyApi, MyApiSync } from '../interface.uts';
-
-/* 引入 unierror.uts 文件中定义的变量 */
-import { MyApiFailImpl } from '../unierror';
-
-/**
- * 引入三方库
- * [可选实现，按需引入]
- *
- * 在 iOS 平台引入三方库有以下两种方式：
- * 1、通过引入三方库framework 或者.a 等方式，需要将 .framework 放到 ./Frameworks 目录下，将.a 放到 ./Libs 目录下。更多信息[详见](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html#ios-平台原生配置)
- * 2、通过 cocoaPods 方式引入，将要引入的 pod 信息配置到 config.json 文件下的 dependencies-pods 字段下。详细配置方式[详见](https://uniapp.dcloud.net.cn/plugin/uts-ios-cocoapods.html)
- *
- * 在通过上述任意方式依赖三方库后，使用时需要在文件中 import:
- * 示例：import { LottieLoopMode	} from 'Lottie'
- */
-
-/**
- * UTSiOS 为平台内置对象，不需要 import 可直接调用其API，[详见](https://uniapp.dcloud.net.cn/uts/utsios.html)
- */
-
-/**
- * 异步方法
- *
- * uni-app项目中（vue/nvue）调用示例：
- * 1、引入方法声明 import { myApi } from "@/uni_modules/uts-api"
- * 2、方法调用
- * myApi({
- *   paramA: false,
- *   complete: (res) => {
- *      console.log(res)
- *   }
- * });
- *
- */
-export const myApi : MyApi = function (options : MyApiOptions) {
-
-  if (options.paramA == true) {
-    // 返回数据
-    const res : MyApiResult = {
-      fieldA: 85,
-      fieldB: true,
-      fieldC: 'some message'
-    };
-    options.success?.(res);
-    options.complete?.(res);
-
-  } else {
-    // 返回错误
-    let failResult = new MyApiFailImpl(9010001);
-    options.fail?.(failResult)
-    options.complete?.(failResult)
-  }
-
-}
-
-/**
- * 同步方法
- *
- * uni-app项目中（vue/nvue）调用示例：
- * 1、引入方法声明 import { myApiSync } from "@/uni_modules/uts-api"
- * 2、方法调用
- * myApiSync(true);
- *
- */
-export const myApiSync : MyApiSync = function (paramA : boolean) : MyApiResult {
-  // 返回数据，根据插件功能获取实际的返回值
-  const res : MyApiResult = {
-    fieldA: 85,
-    fieldB: paramA,
-    fieldC: 'some message'
-  };
-  return res;
-}
-
-/**
- * 更多插件开发的信息详见：https://uniapp.dcloud.net.cn/plugin/uts-plugin.html
- */
-- 
GitLab