From 14f064bc4549bc0fbc8f22071cda071cb826f7f2 Mon Sep 17 00:00:00 2001
From: wangzhiyusss <wangzhiyu12@huawei.com>
Date: Tue, 3 Jan 2023 15:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=92=AE=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98&&jscrash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangzhiyusss <wangzhiyu12@huawei.com>
---
 .../src/main/resources/rawfile/editor.html         |  6 +++---
 .../main/resources/rawfile/icon/picture_white.svg  |  1 +
 .../src/main/resources/rawfile/icon/styles.svg     | 11 +++++++++++
 .../src/main/resources/rawfile/icon/todo1.svg      |  1 +
 .../src/main/ets/MainAbility/MainAbility.ts        | 14 +++++++++-----
 5 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 common/resources/src/main/resources/rawfile/icon/picture_white.svg
 create mode 100644 common/resources/src/main/resources/rawfile/icon/styles.svg
 create mode 100644 common/resources/src/main/resources/rawfile/icon/todo1.svg

diff --git a/common/resources/src/main/resources/rawfile/editor.html b/common/resources/src/main/resources/rawfile/editor.html
index 67cd2a0..4288cfb 100644
--- a/common/resources/src/main/resources/rawfile/editor.html
+++ b/common/resources/src/main/resources/rawfile/editor.html
@@ -19,15 +19,15 @@
   <div id="editorjs" contenteditable="true"></div>
   <div class="button-box" id="buttonBox">
     <div id="addToDo">
-      <img id="img1" src="../base/media/todo1.svg">
+      <img id="img1" src="icon/todo1.svg">
       <span id="lable1">清单</span>
     </div>
     <div id="chooseStyle">
-      <img id="img2" src="../base/media/styles.svg">
+      <img id="img2" src="icon/styles.svg">
       <span id="lable2">样式</span>
     </div>
     <div id="openAlbum">
-      <img id="img3"src="../base/media/picture_white.svg">
+      <img id="img3"src="icon/picture_white.svg">
       <span id="lable3">相册</span>
     </div>
   </div>
diff --git a/common/resources/src/main/resources/rawfile/icon/picture_white.svg b/common/resources/src/main/resources/rawfile/icon/picture_white.svg
new file mode 100644
index 0000000..1def639
--- /dev/null
+++ b/common/resources/src/main/resources/rawfile/icon/picture_white.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>图片</title><path d="M8.25,7.25A1.75,1.75,0,1,1,6.5,9,1.75,1.75,0,0,1,8.25,7.25Zm9.11882,5.54816a1.06768,1.06768,0,0,0-.63408,0,2.29637,2.29637,0,0,0-.96559.71316l-2.75426,2.75414a2.25128,2.25128,0,0,1-3.18187.0001l-.11045-.11043a2.3173,2.3173,0,0,0-.84342-.63365L8.817,15.50159a1.06752,1.06752,0,0,0-.63408,0,2.29623,2.29623,0,0,0-.96557.71315L3.981,19.45191q.0346.05109.07168.09966l.00012.00339c.03269.0396.067.08112.10266.12117a.47644.47644,0,0,0,.03359.03877l-.03359-.03877q.0595.06672.12441.128L4.189,19.7149q.05584.05947.116.11459l-.02523-.02534a2.18793,2.18793,0,0,0,.47389.33886,4.23561,4.23561,0,0,0,2.171.35628L7.12777,20.5h9.74446a4.5924,4.5924,0,0,0,2.37406-.357,2.135,2.135,0,0,0,.89672-.89672,4.23561,4.23561,0,0,0,.35628-2.17095L20.5,16.87223V16.384l-.00025-.707-2.22541-2.2253a2.45615,2.45615,0,0,0-.81106-.62134l-.06248-.02213ZM6.91631,22a5.47979,5.47979,0,0,1-2.85738-.52273,3.703,3.703,0,0,1-1.5362-1.5362c-.05914-.11058-.11032-.21543-.15653-.32242L2.16986,19.164l.03321-.03465A8.915,8.915,0,0,1,2,16.87223V7.12777a5.8843,5.8843,0,0,1,.51223-3.03985l.022-.04161A3.63037,3.63037,0,0,1,3.95414,2.58517l.09217-.0509A5.79955,5.79955,0,0,1,7.12777,2h9.74446a5.88441,5.88441,0,0,1,3.03985.51223l.04161.022a3.63031,3.63031,0,0,1,1.46114,1.41987l.0509.09217A5.79955,5.79955,0,0,1,22,7.12777V13.642l-1.5-1.501V7.12777a4.5924,4.5924,0,0,0-.357-2.37406,2.135,2.135,0,0,0-.89672-.89672,4.23561,4.23561,0,0,0-2.17095-.35628L7.02454,3.50018l-.20148.00148A4.06394,4.06394,0,0,0,4.75371,3.857a2.135,2.135,0,0,0-.89672.89672A4.5924,4.5924,0,0,0,3.5,7.12777l.00017,9.84769.00149.20148c.00267.23112.00865.434.01841.61416l2.71111-2.71089a3.49937,3.49937,0,0,1,1.51668-1.01413,2.57567,2.57567,0,0,1,1.51463.00322l.08368.02679a3.64246,3.64246,0,0,1,1.43294.99429l.11406.114a.75112.75112,0,0,0,1.06134.00014L14.783,12.37678a3.49944,3.49944,0,0,1,1.51669-1.01413,2.56723,2.56723,0,0,1,1.50427,0,3.52054,3.52054,0,0,1,1.5271,1.02443L22,15.05581v2.02788a5.47979,5.47979,0,0,1-.52273,2.85738,3.703,3.703,0,0,1-1.5362,1.5362,5.15367,5.15367,0,0,1-2.61861.52139L17.08369,22Z"/></svg>
\ No newline at end of file
diff --git a/common/resources/src/main/resources/rawfile/icon/styles.svg b/common/resources/src/main/resources/rawfile/icon/styles.svg
new file mode 100644
index 0000000..4fb5bb6
--- /dev/null
+++ b/common/resources/src/main/resources/rawfile/icon/styles.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<title>样式</title>
+<path id="形状结合" d="M21.2,19.5c0.4,0,0.8,0.3,0.8,0.8S21.7,21,21.2,21H2.8C2.3,21,2,20.7,2,20.2s0.3-0.8,0.8-0.8H21.2z
+	 M8.3,4.7l4,10.6h-1.4l-1-2.8H5.4l-1,2.8H3L7,4.7H8.3z M21.2,13.5c0.4,0,0.8,0.3,0.8,0.8S21.7,15,21.2,15h-5.5
+	c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8H21.2z M7.7,6.4L6,11.3l3.4,0L7.7,6.4z M21.2,9C21.7,9,22,9.3,22,9.7s-0.3,0.8-0.8,0.8h-7.5
+	c-0.4,0-0.8-0.3-0.8-0.8S13.3,9,13.8,9H21.2z M21.2,4.5c0.4,0,0.8,0.3,0.8,0.8S21.7,6,21.2,6h-9.5C11.3,6,11,5.7,11,5.2
+	s0.3-0.8,0.8-0.8H21.2z"/>
+</svg>
diff --git a/common/resources/src/main/resources/rawfile/icon/todo1.svg b/common/resources/src/main/resources/rawfile/icon/todo1.svg
new file mode 100644
index 0000000..7778298
--- /dev/null
+++ b/common/resources/src/main/resources/rawfile/icon/todo1.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>todo</title><path d="M18.18718,8.71967a.75.75,0,0,1,.03026,1.0286l-.03026.03206-5.94974,5.94975a1.75,1.75,0,0,1-2.43162.04182l-.04326-.04182L6.31282,12.28033a.74644.74644,0,0,1-.20333-.37421L6.095,11.80231v-.10462a.75.75,0,0,1,1.24645-.50828l.03207.03026,3.09619,3.09619a.75.75,0,0,0,1.0286.03026l.03206-.03026,5.59619-5.59619A.75.75,0,0,1,18.18718,8.71967ZM12,2.5A9.5,9.5,0,1,0,21.5,12,9.5,9.5,0,0,0,12,2.5ZM12,1A11,11,0,1,1,1,12,11,11,0,0,1,12,1Z"/></svg>
\ No newline at end of file
diff --git a/product/default/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts
index 07704b5..e9a8efa 100644
--- a/product/default/src/main/ets/MainAbility/MainAbility.ts
+++ b/product/default/src/main/ets/MainAbility/MainAbility.ts
@@ -30,10 +30,14 @@ export default class MainAbility extends Ability {
 
     onCreate(want, launchParam) {
         // @ts-ignore
-        window.getLastWindow(this.context,(err,data)=>{
-            let windowWidth = data.getWindowProperties().windowRect.width
-            LogUtil.info(this.Tag, " getLastWindow：" + windowWidth)
-            this.screenBreakPoints(windowWidth)
+        window.getLastWindow(this.context, (err, data) => {
+            if (data && data.getWindowProperties()) {
+                let windowWidth = data.getWindowProperties().windowRect.width
+                LogUtil.info(this.Tag, " getLastWindow：" + windowWidth)
+                this.screenBreakPoints(windowWidth)
+            } else {
+                LogUtil.info(this.Tag, "getWindowProperties error:" + JSON.stringify(err))
+            }
         })
         LogUtil.info(this.Tag, " onCreate, launchReason is " + launchParam.launchReason + ", deviceType" + deviceInfo.deviceType)
         if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') {
@@ -200,7 +204,7 @@ export default class MainAbility extends Ability {
         }
     }
 
-    screenBreakPoints(data){
+    screenBreakPoints(data) {
         let displayClass = null
         let screenDpi = null
         displayClass = display.getDefaultDisplaySync()
-- 
Gitee