From 82aada5ecde36ef038eb918de936799cb8ded075 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 29 Apr 2025 20:13:18 +0800
Subject: [PATCH] =?UTF-8?q?reactor=EF=BC=9AosName=20=E7=9A=84=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=EF=BC=8C=E4=BB=8E=20getSystemInfoSync=20=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=20getDeviceInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

reactor：pixelRatio/windowHeight/windowWidth 的获取，从 getSystemInfoSync 迁移到 getWindowInfo
---
 sheep/ui/su-tabs/su-tabs.vue                   |  7 ++++---
 .../components/l-painter/l-painter.vue         | 18 +++++++++---------
 .../lime-painter/components/l-painter/nvue.js  |  5 +----
 .../lime-painter/components/l-painter/utils.js |  5 +++--
 .../uni-datetime-picker/time-picker.vue        |  2 +-
 .../uni-datetime-picker.vue                    |  2 +-
 .../components/uni-nav-bar/uni-status-bar.vue  |  2 +-
 .../uni-notice-bar/uni-notice-bar.vue          |  2 +-
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/sheep/ui/su-tabs/su-tabs.vue b/sheep/ui/su-tabs/su-tabs.vue
index 05d7dcb3..0cd0b93c 100644
--- a/sheep/ui/su-tabs/su-tabs.vue
+++ b/sheep/ui/su-tabs/su-tabs.vue
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-  import { deepMerge, addStyle, addUnit, sleep, getPx, sys } from '@/sheep/helper';
+  import { deepMerge, addStyle, addUnit, sleep, getPx } from '@/sheep/helper';
   // #ifdef APP-NVUE
   const animation = uni.requireNativePlugin('animation');
   const dom = uni.requireNativePlugin('dom');
@@ -221,7 +221,8 @@
     methods: {
       $uGetRect(selector, all) {
         return new Promise((resolve) => {
-          uni.createSelectorQuery()
+          uni
+            .createSelectorQuery()
             .in(this)
             [all ? 'selectAll' : 'select'](selector)
             .boundingClientRect((rect) => {
@@ -301,7 +302,7 @@
           return total + curr.rect.width;
         }, 0);
         // 此处为屏幕宽度
-        const windowWidth = sys().windowWidth;
+        const windowWidth = uni.getWindowInfo().windowWidth;
         // 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
         let scrollLeft =
           offsetLeft -
diff --git a/uni_modules/lime-painter/components/l-painter/l-painter.vue b/uni_modules/lime-painter/components/l-painter/l-painter.vue
index 83926fd8..c5cc8da8 100644
--- a/uni_modules/lime-painter/components/l-painter/l-painter.vue
+++ b/uni_modules/lime-painter/components/l-painter/l-painter.vue
@@ -60,7 +60,7 @@
 				}
 			},
 			dpr() {
-				return this.pixelRatio || uni.getSystemInfoSync().pixelRatio;
+				return this.pixelRatio || uni.getWindowInfo().pixelRatio;
 			},
 			boardWidth() {
 				const {width = 0} = (this.elements && this.elements.css) || this.elements || this
@@ -168,7 +168,7 @@
 			},
 			runTask(){
 				while(this.tasks.length){
-					const task = this.tasks.shift()	
+					const task = this.tasks.shift()
 					 this.canvasToTempFilePath(task)
 				}
 			},
@@ -199,7 +199,7 @@
 				// #endif
 				await this.getSize(args)
 				const ctx = await this.getContext();
-				
+
 				let {
 					use2dCanvas,
 					boardWidth,
@@ -243,7 +243,7 @@
 						}
 					}
 					this.painter = new Painter(param)
-				} 
+				}
 				try{
 					// vue3 赋值给data会引起图片无法绘制
 					const { width, height } = await this.painter.source(JSON.parse(JSON.stringify(args)))
@@ -278,7 +278,7 @@
 				}catch(e){
 					//TODO handle the exception
 				}
-				
+
 			},
 			canvasDraw(flag = false) {
 				return new Promise((resolve, reject) => this.ctx.draw(flag, () => setTimeout(() => resolve(), this
@@ -308,7 +308,7 @@
 										this.use2dCanvas = false;
 										this.canvas = res;
 									}
-									
+
 									// 钉钉小程序框架不支持 measureText 方法，用此方法 mock
 									if (!ctx.measureText) {
 										function strLen(str) {
@@ -334,7 +334,7 @@
 											};
 										}
 									}
-									
+
 									// #ifdef MP-ALIPAY
 									ctx.scale(dpr, dpr);
 									// #endif
@@ -384,7 +384,7 @@
 							this.$emit('fail', e)
 						}
 					}
-					
+
 					let { top: y = 0, left: x = 0, width, height } = this.boundary || this;
 					// let destWidth = width * dpr;
 					// let destHeight = height * dpr;
@@ -392,7 +392,7 @@
 					// width = destWidth;
 					// height = destHeight;
 					// #endif
-					
+
 					const copyArgs = Object.assign({
 						// x,
 						// y,
diff --git a/uni_modules/lime-painter/components/l-painter/nvue.js b/uni_modules/lime-painter/components/l-painter/nvue.js
index 25645fba..db7e0a2e 100644
--- a/uni_modules/lime-painter/components/l-painter/nvue.js
+++ b/uni_modules/lime-painter/components/l-painter/nvue.js
@@ -6,16 +6,13 @@ import {
 	networkReg
 } from './utils';
 const dom = weex.requireModule('dom')
-import {
-	version
-} from '../../package.json'
 
 export default {
 	data() {
 		return {
 			tempFilePath: [],
 			isInitFile: false,
-			osName: uni.getSystemInfoSync().osName
+			osName: uni.getDeviceInfo().osName
 		}
 	},
 	methods: {
diff --git a/uni_modules/lime-painter/components/l-painter/utils.js b/uni_modules/lime-painter/components/l-painter/utils.js
index cea5c6ec..3c3bcc4e 100644
--- a/uni_modules/lime-painter/components/l-painter/utils.js
+++ b/uni_modules/lime-painter/components/l-painter/utils.js
@@ -3,7 +3,8 @@ export const isBase64 = (path) => /^data:image\/(\w+);base64/.test(path);
 export function sleep(delay) {
 	return new Promise(resolve => setTimeout(resolve, delay))
 }
-let {platform, SDKVersion} = uni.getSystemInfoSync() 
+let platform = uni.getDeviceInfo().platform
+let SDKVersion = uni.getSystemInfoSync().SDKVersion
 export const isPC = /windows|mac/.test(platform)
 // 缓存图片
 let cache = {}
@@ -316,7 +317,7 @@ export function getImageInfo(path, useCORS) {
 					// #ifdef APP-PLUS
 					// console.log('getImageInfo', +new Date() - time)
 					// ios 比较严格 可能需要设置跨域
-					if(uni.getSystemInfoSync().osName == 'ios' && useCORS) {
+					if(uni.getDeviceInfo().osName === 'ios' && useCORS) {
 						pathToBase64(image.path).then(base64 => {
 							image.path = base64
 							cache[path] = image
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
index 699aa639..e6ad4b83 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -432,7 +432,7 @@
 
 		mounted() {
 			// #ifdef APP-NVUE
-			const res = uni.getSystemInfoSync();
+			const res = uni.getWindowInfo();
 			this.fixNvueBug = {
 				top: res.windowHeight / 2,
 				left: res.windowWidth / 2
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
index 91741815..054c25c0 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -473,7 +473,7 @@
 				right.setDate(this.$refs.right.nowDate.fullDate)
 			},
 			platform() {
-				const systemInfo = uni.getSystemInfoSync()
+				const systemInfo = uni.getWindowInfo()
 				this.isPhone = systemInfo.windowWidth <= 500
 				this.windowWidth = systemInfo.windowWidth
 			},
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
index 6a688744..30367a04 100644
--- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
@@ -13,7 +13,7 @@
 			}
 		},
 		mounted() {
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
+			this.statusBarHeight = uni.getWindowInfo().statusBarHeight + 'px'
 		}
 	}
 </script>
diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
index 424430da..5aa1c566 100644
--- a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
+++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
@@ -187,7 +187,7 @@
 					// #endif
 					// #ifdef APP-NVUE
 					dom.getComponentRect(this.$refs['animationEle'], (res) => {
-						let winWidth = uni.getSystemInfoSync().windowWidth
+						let winWidth = uni.getWindowInfo().windowWidth
 						this.textWidth = res.size.width
 						animation.transition(this.$refs['animationEle'], {
 							styles: {