From ca11f03a19047a459e4b98d9f53a721a341e15a1 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Tue, 7 Nov 2023 15:13:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(upgrade-center):=20=E5=95=86=E5=BA=97?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E3=80=81=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/component.uvue                   | 65 +++++++--------
 .../uni-upgrade-center-app.uvue}              | 80 +++++++++++++++----
 .../pages/upgrade-popup.vue                   | 10 ++-
 .../utils/call-check-version.ts               | 10 ++-
 .../utils/check-update.ts                     | 41 +++++-----
 .../uni-upgrade-center-app/utils/utils.uts    | 17 ++++
 6 files changed, 143 insertions(+), 80 deletions(-)
 rename uni_modules/uni-upgrade-center-app/{pages/upgrade-popup-uts.uvue => components/uni-upgrade-center-app/uni-upgrade-center-app.uvue} (79%)
 create mode 100644 uni_modules/uni-upgrade-center-app/utils/utils.uts

diff --git a/pages/tabBar/component.uvue b/pages/tabBar/component.uvue
index 74fc727a..7e07049a 100644
--- a/pages/tabBar/component.uvue
+++ b/pages/tabBar/component.uvue
@@ -38,18 +38,17 @@
             </view>
           </uni-collapse-item>
         </template>
-      </uni-collapse>
-
-      <!-- <upgradePopup ref="upgradePopup" @close="upgradePopupClose" /> -->
+      </uni-collapse>
+
+      <uni-upgrade-center-app ref="upgradePopup" @close="upgradePopupClose" />
     </view>
     <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
 </template>
 
-<script lang="uts">
-/* import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
-import upgradePopup from '@/uni_modules/uni-upgrade-center-app/pages/upgrade-popup-uts.uvue' */
+<script lang="uts">
+import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
 
 type Page = {
   name : string
@@ -92,9 +91,9 @@ export default {
               */
             {
               name: 'list-view',
-            },
-            {
-              name: 'sticky-header',
+            },
+            {
+              name: 'sticky-header',
             }
           ] as Page[],
         },
@@ -224,17 +223,17 @@ export default {
               url: '/pages/component/web-view-local/web-view-local',
             },
           ] as Page[],
-        },
-        {
-          id: 'unicloud-db',
-          name: 'unicloud-db',
-          pages: [
-            {
-              name: '联系人',
-              enable: true,
-              url: '/pages/component/unicloud-db-contacts/list'
-            }
-          ] as Page[],
+        },
+        {
+          id: 'unicloud-db',
+          name: 'unicloud-db',
+          pages: [
+            {
+              name: '联系人',
+              enable: true,
+              url: '/pages/component/unicloud-db-contacts/list'
+            }
+          ] as Page[],
         },
         /*
           {
@@ -270,10 +269,7 @@ export default {
       arrowDownIcon: '/static/icons/arrow-down.png',
       arrowRightIcon: '/static/icons/arrow-right.png',
     }
-  },
-  /* components: {
-    upgradePopup: upgradePopup
-  }, */
+  },
   methods: {
     goDetailPage(e : Page) {
       if (e.enable == false) {
@@ -288,18 +284,17 @@ export default {
       uni.navigateTo({
         url,
       })
-    },
-    upgradePopupClose() {
-      console.log('upgradePopup close');
+    },
+    upgradePopupClose() {
+      console.log('upgradePopup close');
     }
-  },
-  /* ,
-  onReady() {
-  	checkUpdate(this.$refs['upgradePopup'] as ComponentPublicInstance)
-  },
-  beforeUnmount() {
-    uni.showTabBar()?.catch(_ => {})
-  } */
+  },
+  onReady() {
+  	checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
+  },
+  beforeUnmount() {
+    uni.showTabBar()?.catch(_ => {})
+  }
 }
 </script>
 
diff --git a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup-uts.uvue b/uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue
similarity index 79%
rename from uni_modules/uni-upgrade-center-app/pages/upgrade-popup-uts.uvue
rename to uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue
index f17da292..79af7b4f 100644
--- a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup-uts.uvue
+++ b/uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue
@@ -11,7 +11,7 @@
 			<view class="content-body">
 				<view class="content-body-title">
 					<text class="text title">{{subTitle}}</text>
-					<!-- <text style="padding-left:20rpx;font-size: 0.5em;color: #666;">v.{{version}}</text> -->
+					<text class="text version">v{{version}}</text>
 				</view>
 				<view class="body">
 					<scroll-view class="box-des-scroll" scroll-y="true">
@@ -41,22 +41,16 @@
 								</view>
 							</view>
 
-							<button v-else class="content-button"
-								style="border: none; color: #fff;width: 100%;height: 80rpx;line-height: 80rpx;font-size: 30rpx;font-weight: 400;border-radius: 40rpx;text-align: center;background:  #1785ff"
-								:plain="true" @click="updateApp">
+							<button v-else class="content-button" @click="updateApp">
 								{{downLoadBtnText}}
 							</button>
 						</template>
 
-						<button v-else-if="downloadSuccess && !installed" class="content-button"
-							style="border: none; color: #fff;width: 100%;height: 80rpx;line-height: 80rpx;font-size: 30rpx;font-weight: 400;border-radius: 40rpx;text-align: center;background:  #1785ff"
-							:plain="true" :loading="installing" :disabled="installing" @click="installPackage">
+						<button v-else-if="downloadSuccess && !installed" class="content-button" :loading="installing" :disabled="installing" @click="installPackage">
 							{{installing ? '正在安装……' : '下载完成，立即安装'}}
 						</button>
 
-						<button v-else-if="installed" class="content-button"
-							style="border: none; color: #ccc;width: 100%;height: 80rpx;line-height: 80rpx;font-size: 30rpx;font-weight: 400;border-radius: 40rpx;text-align: center;background:  #1785ff"
-							:plain="true" :disabled="true">
+						<button v-else-if="installed" class="content-button" :disabled="true">
 							安装完成后，请重启应用
 						</button>
 					</template>
@@ -64,8 +58,7 @@
 			</view>
 
 			<view class="content-bottom">
-				<image v-if="!is_mandatory" class="close-img" mode="widthFix"
-					src="/uni_modules/uni-upgrade-center-app/static/app_update_close.png" @click="closeUpdate">
+				<image v-if="!is_mandatory" class="close-img" mode="widthFix" src="/uni_modules/uni-upgrade-center-app/static/app_update_close.png" @click="closeUpdate">
 				</image>
 			</view>
 		</view>
@@ -73,12 +66,14 @@
 </template>
 
 <script>
-	import { UniUpgradeCenterResult } from '../utils/call-check-version'
+	import { UniUpgradeCenterResult, StoreListItem } from '../../utils/call-check-version'
+  import { openSchema } from '../../utils/utils.uts'
 
 	const localFilePathKey = 'UNI_ADMIN_UPGRADE_CENTER_LOCAL_FILE_PATH'
 	const platform_iOS = 'iOS';
 	const requiredKey = ['version', 'url', 'type']
 	let downloadTask : DownloadTask | null = null;
+	let openSchemePromise: Promise<boolean> | null = null;
 
 	/**
 	 * 对比版本号，如需要，请自行修改判断规则
@@ -148,6 +143,7 @@
 				// 默认安装包信息
 				title: '更新日志',
 				contents: '',
+				version: '',
 				is_mandatory: false,
 
 				// 可自定义属性
@@ -157,7 +153,8 @@
 				downLoadingText: '安装包下载中，请稍后',
 
 				url: "",
-				platform: [] as string[]
+				platform: [] as string[],
+        store_list: null as StoreListItem[] | null
 			}
 		},
 		computed: {
@@ -184,6 +181,8 @@
 				this.contents = localPackageInfo.contents
 				this.is_mandatory = localPackageInfo.is_mandatory
 				this.platform = localPackageInfo.platform
+				this.version = localPackageInfo.version
+        this.store_list = localPackageInfo.store_list
 				this.shown = shown
 			},
 			closeUpdate() {
@@ -230,14 +229,43 @@
 				this.$emit('close')
 			},
 			updateApp() {
-				this.downloadPackage()
+        const checkStoreScheme = this.checkStoreScheme()
+        if (checkStoreScheme !== null) {
+          checkStoreScheme
+            .then(_ => { })
+            .catch(() => { this.downloadPackage() })
+            .finally(() => {
+              openSchemePromise = null
+            })
+        } else { this.downloadPackage() }
 			},
+      // 跳转应用商店
+      checkStoreScheme(): Promise<boolean> | null {
+        if (this.store_list !== null) {
+          const storeList: StoreListItem[] = this.store_list!.filter((item: StoreListItem): boolean => item.enable)
+          if (storeList.length > 0) {
+            if (openSchemePromise === null) {
+              openSchemePromise = Promise.reject() as Promise<boolean>
+            }
+            storeList
+              .sort((cur: StoreListItem, next: StoreListItem): number => next.priority - cur.priority)
+              .map((item: StoreListItem): string => item.scheme)
+              .reduce((promise: Promise<boolean>, cur: string): Promise<boolean> => {
+                openSchemePromise = promise.catch((): Promise<boolean> => openSchema(cur))
+                return openSchemePromise!
+              }, openSchemePromise!)
+            return openSchemePromise!
+          }
+        }
+
+      	return null
+      },
 			downloadPackage() {
 				//下载包
 				downloadTask = uni.downloadFile({
 					url: this.url,
 					success: res => {
-						console.log('downloadFile res: ',res);
+						console.log('downloadFile res: ', res);
 						if (res.statusCode == 200) {
 							this.tempFilePath = res.tempFilePath
 							this.downLoadComplete()
@@ -367,6 +395,21 @@
 		border-bottom-right-radius: 30rpx;
 	}
 
+	.content-body-title {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.content-body-title .version {
+		padding-left: 20rpx;
+		color: #fff;
+		font-size: 20rpx;
+		margin-left: 10rpx;
+		padding: 4rpx 8rpx;
+		border-radius: 20rpx;
+		background: #50aefd;
+	}
+
 	.title {
 		font-size: 32rpx;
 		font-weight: bold;
@@ -416,6 +459,8 @@
 	}
 
 	.content-button {
+    border: none;
+    color: #fff;
 		width: 100%;
 		height: 80rpx;
 		line-height: 80rpx;
@@ -427,6 +472,7 @@
 		text-align: center;
 
 		background-color: #1785ff;
+
 	}
 
 	.flex-column {
@@ -434,4 +480,4 @@
 		flex-direction: column;
 		align-items: center;
 	}
-</style>
\ No newline at end of file
+</style>
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 ab786602..2a98a215 100644
--- a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
+++ b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
@@ -245,9 +245,13 @@
 				uni.navigateBack()
 			},
 			updateApp() {
-				this.checkStoreScheme().catch(() => {
-					this.downloadPackage()
-				})
+				this.checkStoreScheme()
+          .catch(() => {
+            this.downloadPackage()
+          })
+          .finally(() => {
+            openSchemePromise = null
+          })
 			},
 			// 跳转应用商店
 			checkStoreScheme() {
diff --git a/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts b/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
index ce741bb0..1d0c10a5 100644
--- a/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
+++ b/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
@@ -76,18 +76,20 @@ export default function (): Promise<UniUpgradeCenterResult> {
 					name: 'uni-upgrade-center',
 					data: data
 				}).then(res => {
-					const result = JSON.parse<UniUpgradeCenterResult>(JSON.stringify(res.result))
-					if (result === null ){
+          const code = res.result['code']
+          if (['Int', 'Long', 'number'].includes(typeof code) && (code  as number) < 0) {
 						reject({
 							code: res.result['code'],
 							message: res.result['message']
 						})
-					} else {
+          } else {
+            const result = JSON.parse<UniUpgradeCenterResult>(JSON.stringify(res.result)) as UniUpgradeCenterResult
 						resolve(result)
 					}
 				}).catch<void>((err : any | null) => {
-					console.log('err: ', err);
 					const error = err as UniCloudError
+          if (error.errMsg == '未匹配到云函数[uni-upgrade-center]')
+            error.errMsg = '【uni-upgrade-center-app】未配置uni-upgrade-center，无法升级。参考: https://uniapp.dcloud.net.cn/uniCloud/upgrade-center.html'
 					reject(error.errMsg)
 				})
 			} catch (e) {
diff --git a/uni_modules/uni-upgrade-center-app/utils/check-update.ts b/uni_modules/uni-upgrade-center-app/utils/check-update.ts
index 16fdc9dd..88ec227d 100644
--- a/uni_modules/uni-upgrade-center-app/utils/check-update.ts
+++ b/uni_modules/uni-upgrade-center-app/utils/check-update.ts
@@ -22,11 +22,11 @@ export default function () : Promise<UniUpgradeCenterResult> {
 			// const platform = uniUpgradeCenterResult.platform // 安装包平台
 			// const type = uniUpgradeCenterResult.type // 安装包类型
 
-			// 此处逻辑仅为实例，可自行编写
-			if (code > 0) {
-				// 腾讯云和阿里云下载链接不同，需要处理一下，阿里云会原样返回
-				const tcbRes = await uniCloud.getTempFileURL({ fileList: [url] });
-				if (typeof tcbRes.fileList[0].tempFileURL !== 'undefined') uniUpgradeCenterResult.url = tcbRes.fileList[0].tempFileURL;
+        // 此处逻辑仅为示例，可自行编写
+        if (code > 0) {
+          // 腾讯云和阿里云下载链接不同，需要处理一下，阿里云会原样返回
+          const tcbRes = await uniCloud.getTempFileURL({ fileList: [url] });
+          if (typeof tcbRes.fileList[0].tempFileURL !== 'undefined') uniUpgradeCenterResult.url = tcbRes.fileList[0].tempFileURL;
 
 				/**
 				 * 提示升级一
@@ -52,21 +52,20 @@ export default function () : Promise<UniUpgradeCenterResult> {
 				component?.$callMethod('show', true, uniUpgradeCenterResult)
 				// #endif
 
-				return resolve(uniUpgradeCenterResult)
-			} else if (code < 0) {
-				// TODO 云函数报错处理
-				console.error(message)
-				return reject(uniUpgradeCenterResult)
-			}
-			return resolve(uniUpgradeCenterResult)
-		}).catch((err) => {
-			// TODO 云函数报错处理
-			console.error(err)
-			reject(err)
-		})
-	});
-	// #endif
-}
+          return resolve(uniUpgradeCenterResult)
+        } else if (code < 0) {
+          // TODO 云函数报错处理
+          console.error(message)
+          return reject(uniUpgradeCenterResult)
+        }
+        return resolve(uniUpgradeCenterResult)
+      }).catch((err) => {
+        // TODO 云函数报错处理
+        reject(err)
+      })
+    });
+    // #endif
+  }
 
 // #ifdef UNI-APP-X
 /**
@@ -203,4 +202,4 @@ function updateUseModal(packageInfo : UniUpgradeCenterResult) : void {
 		}
 	});
 }
-// #endif
\ No newline at end of file
+// #endif
diff --git a/uni_modules/uni-upgrade-center-app/utils/utils.uts b/uni_modules/uni-upgrade-center-app/utils/utils.uts
new file mode 100644
index 00000000..28ceeab7
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/utils/utils.uts
@@ -0,0 +1,17 @@
+import Intent from 'android.content.Intent';
+import Uri from 'android.net.Uri';
+
+export function openSchema(url : string) : Promise<boolean> {
+  return new Promise<boolean>((resolve, reject) => {
+    try {
+      const context = UTSAndroid.getUniActivity()!;
+      const uri = Uri.parse(url)
+      const intent = new Intent(Intent.ACTION_VIEW, uri)
+      intent.setData(uri);
+      context.startActivity(intent);
+      resolve(true)
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
-- 
GitLab