From c680b15eeb83d1454e7ae483ff0ba5e96c0f05b2 Mon Sep 17 00:00:00 2001
From: Cheliangzhao <cheliangzhao@wps.cn>
Date: Wed, 11 Sep 2024 20:53:19 +0800
Subject: [PATCH] =?UTF-8?q?merge:=20=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/{ => chat}/ChatList.cj     |  3 +-
 .../components/{Chat => chat}/ChatMessage.cj  |  2 +-
 entry/src/main/cangjie/src/pages/HomePage.cj  |  2 --
 entry/src/main/cangjie/src/pages/SidePage.cj  |  2 --
 entry/src/main/cangjie/src/utils/Logger.cj    | 35 -------------------
 5 files changed, 2 insertions(+), 42 deletions(-)
 rename entry/src/main/cangjie/src/components/{ => chat}/ChatList.cj (92%)
 rename entry/src/main/cangjie/src/components/{Chat => chat}/ChatMessage.cj (98%)
 delete mode 100644 entry/src/main/cangjie/src/utils/Logger.cj

diff --git a/entry/src/main/cangjie/src/components/ChatList.cj b/entry/src/main/cangjie/src/components/chat/ChatList.cj
similarity index 92%
rename from entry/src/main/cangjie/src/components/ChatList.cj
rename to entry/src/main/cangjie/src/components/chat/ChatList.cj
index ad03ece..aaff98c 100644
--- a/entry/src/main/cangjie/src/components/ChatList.cj
+++ b/entry/src/main/cangjie/src/components/chat/ChatList.cj
@@ -1,13 +1,12 @@
 /**
  * Created on 2024/9/10
  */
-package ohos_app_cangjie_entry.components
+package ohos_app_cangjie_entry.components.chat
 
 internal import ohos.component.*
 internal import ohos.state_manage.*
 internal import ohos.base.*
 import ohos.state_macro_manage.*
-import ohos_app_cangjie_entry.components.Chat.*
 
 @Component
 public class ChatList {
diff --git a/entry/src/main/cangjie/src/components/Chat/ChatMessage.cj b/entry/src/main/cangjie/src/components/chat/ChatMessage.cj
similarity index 98%
rename from entry/src/main/cangjie/src/components/Chat/ChatMessage.cj
rename to entry/src/main/cangjie/src/components/chat/ChatMessage.cj
index aedb237..4809586 100644
--- a/entry/src/main/cangjie/src/components/Chat/ChatMessage.cj
+++ b/entry/src/main/cangjie/src/components/chat/ChatMessage.cj
@@ -1,7 +1,7 @@
 /**
  * Created on 2024/9/10
  */
-package ohos_app_cangjie_entry.components.Chat
+package ohos_app_cangjie_entry.components.chat
 
 import std.collection.*
 import ohos.component.*
diff --git a/entry/src/main/cangjie/src/pages/HomePage.cj b/entry/src/main/cangjie/src/pages/HomePage.cj
index 19b4413..001d0fe 100644
--- a/entry/src/main/cangjie/src/pages/HomePage.cj
+++ b/entry/src/main/cangjie/src/pages/HomePage.cj
@@ -7,13 +7,11 @@ internal import ohos.base.*
 internal import ohos.component.*
 internal import ohos.state_manage.*
 import ohos.state_macro_manage.*
-import ohos_app_cangjie_entry.utils.Logger
 
 @Component
 public class HomePage {
     private let TAG = "HomePage"
     protected func aboutToAppear() {
-        Logger(TAG).info("aboutToAppear")
     }
     func build() {
         Row()
diff --git a/entry/src/main/cangjie/src/pages/SidePage.cj b/entry/src/main/cangjie/src/pages/SidePage.cj
index a93700c..984ca34 100644
--- a/entry/src/main/cangjie/src/pages/SidePage.cj
+++ b/entry/src/main/cangjie/src/pages/SidePage.cj
@@ -7,13 +7,11 @@ internal import ohos.base.*
 internal import ohos.component.*
 internal import ohos.state_manage.*
 import ohos.state_macro_manage.*
-import ohos_app_cangjie_entry.utils.Logger
 
 @Component
 public class SidePage {
     private let TAG: String = "SidePage"
     protected func aboutToAppear() {
-        Logger(this.TAG).info("aboutToAppear")
     }
     func build() {
         Row()
diff --git a/entry/src/main/cangjie/src/utils/Logger.cj b/entry/src/main/cangjie/src/utils/Logger.cj
deleted file mode 100644
index 08b87b6..0000000
--- a/entry/src/main/cangjie/src/utils/Logger.cj
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Created on 2024/9/7
- */
-package ohos_app_cangjie_entry.utils
-
-import std.log.*
-import log.*
-import std.console.*
-
-public class Logger {
-    private let TAG: String
-    private static let logger = SimpleLogger()
-    private static let isOutputFile: Bool = false
-    private static let outputFilePath: String = './logger.log'
-    public init(TAG: String) {
-        logger.setOutput(Console.stdOut)
-        this.TAG = TAG + ": "
-    }
-
-    public func debug(message: String) {
-        logger.debug(this.TAG + message)
-        logger.flush()
-    }
-
-    public func info(msg: String) {
-        logger.info(this.TAG + msg)
-        logger.flush()
-    }
-    public func warn(msg: String) {
-        logger.warn(this.TAG + msg)
-    }
-    public func error(msg: String) {
-        logger.error(this.TAG + msg)
-    }
-}