From 558dff520854d14a49bb7874b2a7521b726a4f13 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Thu, 13 Jul 2023 15:23:50 +0800
Subject: [PATCH] fix: remove useless page & add annotation

---
 App.vue                                       |  39 +--
 pages/API/navigator/navigator.uvue            | 224 +++++++++---------
 .../API/page-lifecycle/page-lifecycle.test.js |  55 -----
 pages/API/page-lifecycle/page-lifecycle.uvue  |  41 ----
 4 files changed, 138 insertions(+), 221 deletions(-)
 delete mode 100644 pages/API/page-lifecycle/page-lifecycle.test.js
 delete mode 100644 pages/API/page-lifecycle/page-lifecycle.uvue

diff --git a/App.vue b/App.vue
index 8a258cc6..d1a2a332 100644
--- a/App.vue
+++ b/App.vue
@@ -2,37 +2,48 @@
 import { state, setLifeCycleNum } from './store/index.uts'
 export default {
   onLaunch: function () {
+    // 自动化测试
     setLifeCycleNum(state.lifeCycleNum + 1000)
-    console.log("App Launch");
+    console.log('App Launch')
 
-    // const performance: Performance = uni.getPerformance()
-    // const observer1: PerformanceObserver = performance.createObserver((entryList: PerformanceObserverEntryList) => {
-    //   console.log("observer1:entryList.getEntries()" + JSON.stringify(entryList.getEntries()))
-    // })
-    // observer1.observe({ entryTypes: ['render', 'navigation'] } as PerformanceObserverOptions)
+    const performance: Performance = uni.getPerformance()
+    const observer1: PerformanceObserver = performance.createObserver(
+      (entryList: PerformanceObserverEntryList) => {
+        console.log(
+          'observer1:entryList.getEntries()' +
+            JSON.stringify(entryList.getEntries())
+        )
+      }
+    )
+    observer1.observe({
+      entryTypes: ['render', 'navigation'],
+    } as PerformanceObserverOptions)
   },
   onShow: function () {
+    // 自动化测试
     setLifeCycleNum(state.lifeCycleNum + 100)
-    console.log("App Show");
+    console.log('App Show')
   },
   onHide: function () {
+    // 自动化测试
     setLifeCycleNum(state.lifeCycleNum - 100)
-    console.log("App Hide");
+    console.log('App Hide')
   },
   onLastPageBackPress: function (): boolean | null {
+    // 自动化测试
     setLifeCycleNum(state.lifeCycleNum - 1000)
     uni.showToast({
-      title: "再按一次退出应用",
-      position: "bottom",
-    });
-    return null;
+      title: '再按一次退出应用',
+      position: 'bottom',
+    })
+    return null
   },
-};
+}
 </script>
 
 <style>
 /*每个页面公共css */
-@import "./common/uni.css";
+@import './common/uni.css';
 
 /* #ifdef H5 */
 @media screen and (min-width: 768px) {
diff --git a/pages/API/navigator/navigator.uvue b/pages/API/navigator/navigator.uvue
index c6ef9616..99d5ffa4 100644
--- a/pages/API/navigator/navigator.uvue
+++ b/pages/API/navigator/navigator.uvue
@@ -1,120 +1,122 @@
 <template>
-	<view>
-		<page-head title="navigate"></page-head>
-		<view class="uni-padding-wrap uni-common-mt">
-			<view style="flex-direction: row">
-				<text style="width: 170px">onLoad触发时间戳：</text>
-				<text style="text-align: right">{{ onLoadTime }}</text>
-			</view>
-			<view style="flex-direction: row">
-				<text style="width: 170px">onReady触发时间戳：</text>
-				<text style="text-align: right">{{ onReadyTime }}</text>
-			</view>
-			<view style="flex-direction: row">
-				<text style="width: 170px">onUnload触发时间戳：</text>
-				<text style="text-align: right">见控制台</text>
-			</view>
-			<view style="flex-direction: row">
-				<text style="width: 170px">onShow触发时间戳：</text>
-				<text style="text-align: right">{{ onShowTime }}</text>
-			</view>
-			<view style="flex-direction: row">
-				<text style="width: 170px">onHide触发时间戳：</text>
-				<text style="text-align: right">{{ onHideTime }}</text>
-			</view>
-			<text>onBackPress触发时间戳：见控制台</text>
-			<!-- <view style="flex-direction: row">
+  <view>
+    <page-head title="navigate"></page-head>
+    <view class="uni-padding-wrap uni-common-mt">
+      <view style="flex-direction: row">
+        <text style="width: 170px">onLoad触发时间戳：</text>
+        <text style="text-align: right">{{ onLoadTime }}</text>
+      </view>
+      <view style="flex-direction: row">
+        <text style="width: 170px">onReady触发时间戳：</text>
+        <text style="text-align: right">{{ onReadyTime }}</text>
+      </view>
+      <view style="flex-direction: row">
+        <text style="width: 170px">onUnload触发时间戳：</text>
+        <text style="text-align: right">见控制台</text>
+      </view>
+      <view style="flex-direction: row">
+        <text style="width: 170px">onShow触发时间戳：</text>
+        <text style="text-align: right">{{ onShowTime }}</text>
+      </view>
+      <view style="flex-direction: row">
+        <text style="width: 170px">onHide触发时间戳：</text>
+        <text style="text-align: right">{{ onHideTime }}</text>
+      </view>
+      <text>onBackPress触发时间戳：见控制台</text>
+      <!-- <view style="flex-direction: row">
 				<text style="width: 170px">onBackPress触发时间戳：</text>
 				<text style="text-align: right">见控制台</text>
 			</view> -->
-			<view class="uni-btn-v">
-				<button @tap="navigateTo" class="uni-btn">
-					跳转新页面，并传递数据
-				</button>
-				<button @tap="navigateBack" class="uni-btn">返回上一页</button>
-				<button @tap="redirectTo" class="uni-btn">在当前页面打开</button>
-				<button @tap="switchTab" class="uni-btn">切换到模板选项卡</button>
-				<button @tap="reLaunch" class="uni-btn">关闭所有页面，打开首页</button>
-				<button @tap="customAnimation" class="uni-btn">
-					使用自定义动画打开页面
-				</button>
-			</view>
-		</view>
-	</view>
+      <view class="uni-btn-v">
+        <button @tap="navigateTo" class="uni-btn">
+          跳转新页面，并传递数据
+        </button>
+        <button @tap="navigateBack" class="uni-btn">返回上一页</button>
+        <button @tap="redirectTo" class="uni-btn">在当前页面打开</button>
+        <button @tap="switchTab" class="uni-btn">切换到模板选项卡</button>
+        <button @tap="reLaunch" class="uni-btn">关闭所有页面，打开首页</button>
+        <button @tap="customAnimation" class="uni-btn">
+          使用自定义动画打开页面
+        </button>
+      </view>
+    </view>
+  </view>
 </template>
 <script lang="ts">
-	import { setLifeCycleNum, state } from '@/store/index.uts'
-	export default {
-		data() {
-			return {
-				onLoadTime: 0,
-				onShowTime: 0,
-				onReadyTime: 0,
-				onHideTime: 0,
-			}
-		},
-		onLoad() {
-			this.onLoadTime = Date.now()
-			console.log('onLoad', this.onLoadTime)
-		},
-		onShow() {
-			this.onShowTime = Date.now()
-			console.log('onShow', this.onShowTime)
-		},
-		onReady() {
-			this.onReadyTime = Date.now()
-			console.log('onReady', this.onReadyTime)
-		},
-		onHide() {
-			this.onHideTime = Date.now()
-			console.log('onHide', Date.now())
-		},
-		onUnload() {
-			console.log('onUnLoad', Date.now())
-		},
-		/* onBackPress() {
+import { setLifeCycleNum, state } from '@/store/index.uts'
+export default {
+  data() {
+    return {
+      onLoadTime: 0,
+      onShowTime: 0,
+      onReadyTime: 0,
+      onHideTime: 0,
+    }
+  },
+  onLoad() {
+    this.onLoadTime = Date.now()
+    console.log('onLoad', this.onLoadTime)
+  },
+  onShow() {
+    this.onShowTime = Date.now()
+    console.log('onShow', this.onShowTime)
+  },
+  onReady() {
+    this.onReadyTime = Date.now()
+    console.log('onReady', this.onReadyTime)
+  },
+  onHide() {
+    this.onHideTime = Date.now()
+    console.log('onHide', Date.now())
+  },
+  onUnload() {
+    console.log('onUnLoad', Date.now())
+  },
+  /* onBackPress() {
 			console.log('onBackPress', Date.now()) // 为何不生效？？？
 			// 要把event也打出来
 		}, */
-		methods: {
-			navigateTo() {
-				uni.navigateTo({
-					url: '/pages/API/navigator/new-page/new-uvue-page-1?data=Hello',
-				})
-			},
-			navigateBack() {
-				uni.navigateBack({
-					delta: 1,
-				})
-			},
-			redirectTo() {
-				uni.redirectTo({
-					url: '/pages/API/navigator/new-page/new-uvue-page-1?data=Hello',
-				})
-			},
-			switchTab() {
-				uni.switchTab({
-					url: '/pages/tabBar/template',
-				})
-			},
-			reLaunch() {
-				uni.reLaunch({
-					url: '/pages/tabBar/component',
-				})
-			},
-			customAnimation() {
-				uni.navigateTo({
-					url: '/pages/API/navigator/new-page/new-uvue-page-1?data=使用自定义动画打开页面',
-					animationType: 'slide-in-bottom',
-					animationDuration: 200,
-				})
-			},
-			setLifeCycleNum(num : number) {
-				setLifeCycleNum(num)
-			},
-			getLifeCycleNum() : number {
-				return state.lifeCycleNum
-			},
-		},
-	}
-</script>
\ No newline at end of file
+  methods: {
+    navigateTo() {
+      uni.navigateTo({
+        url: '/pages/API/navigator/new-page/new-uvue-page-1?data=Hello',
+      })
+    },
+    navigateBack() {
+      uni.navigateBack({
+        delta: 1,
+      })
+    },
+    redirectTo() {
+      uni.redirectTo({
+        url: '/pages/API/navigator/new-page/new-uvue-page-1?data=Hello',
+      })
+    },
+    switchTab() {
+      uni.switchTab({
+        url: '/pages/tabBar/template',
+      })
+    },
+    reLaunch() {
+      uni.reLaunch({
+        url: '/pages/tabBar/component',
+      })
+    },
+    customAnimation() {
+      uni.navigateTo({
+        url: '/pages/API/navigator/new-page/new-uvue-page-1?data=使用自定义动画打开页面',
+        animationType: 'slide-in-bottom',
+        animationDuration: 200,
+      })
+    },
+		// 自动化测试
+    setLifeCycleNum(num: number) {
+      setLifeCycleNum(num)
+    },
+		// 自动化测试
+    getLifeCycleNum(): number {
+      return state.lifeCycleNum
+    },
+  },
+}
+</script>
diff --git a/pages/API/page-lifecycle/page-lifecycle.test.js b/pages/API/page-lifecycle/page-lifecycle.test.js
deleted file mode 100644
index e106beef..00000000
--- a/pages/API/page-lifecycle/page-lifecycle.test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const PAGE_PATH = '/pages/API/page-lifecycle/page-lifecycle'
-const INTERMEDIATE_PAGE_PATH = '/pages/API/navigator/navigator'
-
-describe('page-lifecycle', () => {
-  let page
-  let lifeCycleNum
-  beforeAll(async () => {
-    page = await program.reLaunch(INTERMEDIATE_PAGE_PATH)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(1100)
-
-    const initLifecycleNum = 0
-    await page.callMethod('setLifeCycleNum', initLifecycleNum)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(initLifecycleNum)
-
-    page = await program.reLaunch(PAGE_PATH)
-    await page.waitFor(1000)
-  })
-  it('onLoad onShow onReady', async () => {
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(120)
-  })
-  it('onHide', async () => {
-    page = await program.navigateTo(INTERMEDIATE_PAGE_PATH)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(110)
-    page = await program.navigateBack()
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(120)
-  })
-  it('onUnload', async () => {
-    page = await program.redirectTo(INTERMEDIATE_PAGE_PATH)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(20)
-  })
-  it('onBackPress', async () => {
-    page = await program.navigateTo(PAGE_PATH)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(140)
-    page = await program.navigateBack()
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(30)
-  })
-  it('onLastPageBackPress', async () => {
-    page = await program.navigateBack()
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(-970)
-
-    const resetLifecycleNum = 1100
-    await page.callMethod('setLifeCycleNum', resetLifecycleNum)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
-    expect(lifeCycleNum).toBe(resetLifecycleNum)
-  })
-})
diff --git a/pages/API/page-lifecycle/page-lifecycle.uvue b/pages/API/page-lifecycle/page-lifecycle.uvue
deleted file mode 100644
index c87a3b7c..00000000
--- a/pages/API/page-lifecycle/page-lifecycle.uvue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-	<view class="page">
-		<text>page lifecycle</text>
-	</view>
-</template>
-
-<script lang="ts">
-	import { state, setLifeCycleNum } from '@/store/index.uts'
-	export default {
-		onLoad() {
-			setLifeCycleNum(state.lifeCycleNum + 100)
-			console.log('Page onLoad')
-		},
-		onShow() {
-			setLifeCycleNum(state.lifeCycleNum + 10)
-			console.log('Page onShow')
-		},
-		onReady() {
-			setLifeCycleNum(state.lifeCycleNum + 10)
-			console.log('Page onReady')
-		},
-		onHide() {
-			setLifeCycleNum(state.lifeCycleNum - 10)
-			console.log('Page onHide')
-		},
-		onUnload() {
-			setLifeCycleNum(state.lifeCycleNum - 100)
-			console.log('Page onUnload')
-		},
-		onBackPress(options: Map<string, string>) : boolean | null {
-			setLifeCycleNum(state.lifeCycleNum - 10)
-			console.log('Page onBackPress',options)
-			return null
-		},
-		methods: {
-			getLifeCycleNum() : number {
-				return state.lifeCycleNum
-			}
-		},
-	}
-</script>
-- 
GitLab