分屏启动窗口

Signed-off-by: xingyanan <xingyanan2@huawei.com>
Change-Id: I8855490ed62addd7afa135798e16823457e59a68
Signed-off-by: xingyanan <xingyanan2@huawei.com>

interfaces/innerkits/wm/window.h

@@ -131,7 +131,7 @@ public:
 
 class ITouchOutsideListener : virtual public RefBase {
 public:
-    virtual void OnTouchOutside() = 0;
+    virtual void OnTouchOutside() const = 0;
 };
 
 class Window : public RefBase {

interfaces/innerkits/wm/wm_common.h

@@ -43,7 +43,6 @@ enum class WindowType : uint32_t {
     ABOVE_APP_SYSTEM_WINDOW_BASE = 2100,
     WINDOW_TYPE_APP_LAUNCHING = ABOVE_APP_SYSTEM_WINDOW_BASE,
     WINDOW_TYPE_DOCK_SLICE,
-    WINDOW_TYPE_PLACEHOLDER,
     WINDOW_TYPE_INCOMING_CALL,
     WINDOW_TYPE_SEARCHING_BAR,
     WINDOW_TYPE_SYSTEM_ALARM_WINDOW,
@@ -63,6 +62,7 @@ enum class WindowType : uint32_t {
     WINDOW_TYPE_FREEZE_DISPLAY,
     WINDOW_TYPE_VOICE_INTERACTION,
     WINDOW_TYPE_FLOAT_CAMERA,
+    WINDOW_TYPE_PLACEHOLDER,
     ABOVE_APP_SYSTEM_WINDOW_END,
     SYSTEM_WINDOW_END = ABOVE_APP_SYSTEM_WINDOW_END,
 };

interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp

@@ -208,7 +208,7 @@ void JsWindowListener::OnSizeChange(const sptr<OccupiedAreaChangeInfo>& info)
         *engine_, std::make_unique<AsyncTask>(callback, std::move(execute), std::move(complete)));
 }
 
-void JsWindowListener::OnTouchOutside()
+void JsWindowListener::OnTouchOutside() const
 {
     std::unique_ptr<AsyncTask::CompleteCallback> complete = std::make_unique<AsyncTask::CompleteCallback> (
         [self = weakRef_] (NativeEngine &engine, AsyncTask &task, int32_t status) {

interfaces/kits/napi/window_runtime/window_napi/js_window_listener.h

@@ -58,7 +58,7 @@ public:
     void AfterFocused() override;
     void AfterUnfocused() override;
     void OnSizeChange(const sptr<OccupiedAreaChangeInfo>& info) override;
-    void OnTouchOutside() override;
+    void OnTouchOutside() const override;
     void CallJsMethod(const char* methodName, NativeValue* const* argv = nullptr, size_t argc = 0);
 private:
     void LifeCycleCallBack(LifeCycleEventType eventType);

resources/config/rk3568/window_manager_config.xml

@@ -15,7 +15,7 @@
  -->
  <Configs>
     <!--decor enable is true means app main window show decoration-->
-    <decor enable="true"></decor>
+    <decor enable="false"></decor>
     <!--max number of main window that could be shown on display-->
     <maxAppWindowNumber>100</maxAppWindowNumber>
     <!--minimizeByOther enable is true means fullscreen window will be minmized by other fullscreen window-->

utils/src/surface_draw.cpp

@@ -165,7 +165,7 @@ bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, const s
 {
     OHOS::Rosen::Drawing::Bitmap bitmap;
     OHOS::Rosen::Drawing::BitmapFormat format { OHOS::Rosen::Drawing::ColorType::COLORTYPE_RGBA_8888,
-        OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUYE };
+        OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUE };
     bitmap.Build(width, height, format);
     OHOS::Rosen::Drawing::Canvas canvas;
     canvas.Bind(bitmap);
@@ -185,7 +185,7 @@ bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, uint32_
 {
     OHOS::Rosen::Drawing::Bitmap bitmap;
     OHOS::Rosen::Drawing::BitmapFormat format { OHOS::Rosen::Drawing::ColorType::COLORTYPE_RGBA_8888,
-        OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUYE };
+        OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUE };
     bitmap.Build(width, height, format);
     OHOS::Rosen::Drawing::Canvas canvas;
     canvas.Bind(bitmap);
@@ -239,7 +239,7 @@ bool SurfaceDraw::DoDrawImageRect(uint8_t *addr, int32_t winWidth, int32_t winHe
 {
     OHOS::Rosen::Drawing::Bitmap bitmap;
     OHOS::Rosen::Drawing::BitmapFormat format { OHOS::Rosen::Drawing::ColorType::COLORTYPE_RGBA_8888,
-        OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUYE };
+        OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUE };
     bitmap.Build(winWidth, winHeight, format);
     OHOS::Rosen::Drawing::Canvas canvas;
     canvas.Bind(bitmap);

wmserver/include/inner_window.h

@@ -31,7 +31,7 @@ public:
 class PlaceholderWindowListener : public IWindowLifeCycle, public ITouchOutsideListener, public IInputEventListener {
 public:
     // touch outside listener
-    virtual void OnTouchOutside();
+    virtual void OnTouchOutside() const;
     // input event listener
     virtual void OnKeyEvent(std::shared_ptr<MMI::KeyEvent>& keyEvent);
     virtual void OnPointerInputEvent(std::shared_ptr<MMI::PointerEvent>& pointerEvent);

wmserver/src/inner_window.cpp

@@ -28,7 +28,7 @@ namespace {
 WM_IMPLEMENT_SINGLE_INSTANCE(PlaceHolderWindow)
 WM_IMPLEMENT_SINGLE_INSTANCE(DividerWindow)
 
-void PlaceholderWindowListener::OnTouchOutside()
+void PlaceholderWindowListener::OnTouchOutside() const
 {
     WLOGFD("place holder touch outside");
     PlaceHolderWindow::GetInstance().Destroy();