Adjust modified design

Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/watch-holder/src/watch.cc b/watch-holder/src/watch.cc
index cd3fb90..5139b4a 100644 (file)
--- a/watch-holder/src/watch.cc
+++ b/watch-holder/src/watch.cc
@@ -20,10 +20,10 @@ using namespace std;
 using namespace screen_connector;
 namespace watch_holder {
 
-Watch::Watch(string appid, Evas_Object* viewer_win, IWatchEventListener* holder)
+Watch::Watch(string appid, Evas_Object* viewer_win, Watch::IEvent* listener)
     : RemoteSurfaceEvas(appid, RemoteSurface::WATCH,
         make_shared<screen_connector::EvasObject>(viewer_win, false)),
-        appid_(appid), holder_(holder) {
+        appid_(appid), listener_(listener) {
 }
 
 void Watch::Resume() {
@@ -46,38 +46,25 @@ void Watch::Unbind() {
 
 }
 
-Evas_Object* Watch::GetCurrentImage() {
+Evas_Object* Watch::GetCurrentImage() const {
   return current_image_;
 }
 
-void Watch::OnAdded(Evas_Object* image) {
-}
-
-void Watch::OnUpdated(Evas_Object* image) {
-}
-
-void Watch::OnRemoved(Evas_Object* image) {
-}
-
 void Watch::OnEvasAdded(const std::string& appId, const std::string& instId,
     int pid, const screen_connector::EvasObject& image) {
   current_image_ = image.GetRaw();
-  holder_->OnWatchAdded(*this, image.GetRaw());
+  listener_->OnAdded(*this);
 }
 
 void Watch::OnEvasRemoved(const std::string& appId, const std::string& instId,
     int pid, const screen_connector::EvasObject& image) {
-  holder_->OnWatchRemoved(*this, image.GetRaw());
+  listener_->OnRemoved(*this);
   current_image_ = nullptr;
 }
 
 void Watch::OnEvasChanged(const std::string& appId, const std::string& instId,
     int pid, const screen_connector::EvasObject& image) {
-  holder_->OnWatchUpdated(*this, image.GetRaw());
-}
-
-float Watch::GetOpr() {
-  return 0.0f;
+  listener_->OnUpdated(*this);
 }
 
 }   // namspace watch_holder

diff --git a/watch-holder/src/watch.hh b/watch-holder/src/watch.hh
index 297387c..d9945af 100644 (file)
--- a/watch-holder/src/watch.hh
+++ b/watch-holder/src/watch.hh
@@ -18,6 +18,7 @@
 #define __WATCH_HOLDER_WATCH_HH__
 
 #include <Evas.h>
+#include <bundle_cpp.h>
 
 #include <string>
 #include <screen_connector_remote_surface_evas/remote_surface_evas.h>
@@ -28,23 +29,26 @@ namespace watch_holder {
 
 class EXPORT_API Watch : private screen_connector::RemoteSurfaceEvas {
  public:
-  class IWatchEventListener {
+  class IEvent {
    public:
-    virtual void OnWatchAdded(Watch& watch, Evas_Object* image) = 0;
-    virtual void OnWatchUpdated(Watch& watch, Evas_Object* image) = 0;
-    virtual void OnWatchRemoved(Watch& watch, Evas_Object* image) = 0;
+    virtual void OnBound(const Watch& watch) = 0;
+    virtual void OnAdded(const Watch& watch) = 0;
+    virtual void OnUpdated(const Watch& watch) = 0;
+    virtual void OnRemoved(const Watch& watch) = 0;
   };
-  Watch(std::string appid, Evas_Object* viewer_win, IWatchEventListener* listener);
+  Watch(std::string appid, Evas_Object* viewer_win, IEvent* listener);
   void Resume();
   void Pause();
   void Terminate();
   void Bind(Evas_Object* win);
   void Unbind();
-  Evas_Object* GetCurrentImage();
-  void OnAdded(Evas_Object* image);
-  void OnUpdated(Evas_Object* image);
-  void OnRemoved(Evas_Object* image);
-  float GetOpr();
+  Evas_Object* GetCurrentImage() const ;
+  void NotifyChangedEvent();
+  bool IsBound();
+  std::string GetAppId();
+  int GetPid();
+  tizen_base::Bundle GetExtra();
+  bool IsFaulted();
  private:
   void OnEvasAdded(const std::string& appId, const std::string& instId,
     int pid, const screen_connector::EvasObject& image) override;
@@ -55,7 +59,7 @@ class EXPORT_API Watch : private screen_connector::RemoteSurfaceEvas {
 
  private:
   std::string appid_;
-  IWatchEventListener* holder_;
+  IEvent* listener_;
   Evas_Object* current_image_;
 };
 

diff --git a/watch-holder/src/watch_holder.cc b/watch-holder/src/watch_holder.cc
index 46b73b6..43358de 100644 (file)
--- a/watch-holder/src/watch_holder.cc
+++ b/watch-holder/src/watch_holder.cc
@@ -84,24 +84,19 @@ Watch* WatchHolder::GetCurrent() {
   return nullptr;
 }
 
-void WatchHolder::OnWatchDead(Watch& watch) {
-
-}
-
-void WatchHolder::OnWatchLaunched(Watch& watch) {
-
+void WatchHolder::OnDead(const Watch& watch) {
 }
 
-void WatchHolder::OnWatchBound(Watch& watch) {
+void WatchHolder::OnBound(const Watch& watch) {
 }
 
-void WatchHolder::OnWatchAdded(Watch& watch, Evas_Object* image) {
+void WatchHolder::OnAdded(const Watch& watch) {
 }
 
-void WatchHolder::OnWatchUpdated(Watch& watch, Evas_Object* image) {
+void WatchHolder::OnUpdated(const Watch& watch) {
 }
 
-void WatchHolder::OnWatchRemoved(Watch& watch, Evas_Object* image) {
+void WatchHolder::OnRemoved(const Watch& watch) {
 }
 
 int WatchHolder::OnDeadSignal(const char *endpoint, aul_app_com_result_e e,
@@ -122,7 +117,6 @@ int WatchHolder::OnLaunchSignal(const char *endpoint,
 
   string watch_appid = launch_data.GetString(AUL_K_APPID);
   holder->stack_.push_back(make_shared<Watch>(watch_appid, holder->win_, holder));
-  holder->OnWatchLaunched(*holder->stack_.back());
   return 0;
 }
 

diff --git a/watch-holder/src/watch_holder.hh b/watch-holder/src/watch_holder.hh
index 608114e..9e470cb 100644 (file)
--- a/watch-holder/src/watch_holder.hh
+++ b/watch-holder/src/watch_holder.hh
@@ -31,7 +31,7 @@
 
 namespace watch_holder {
 
-class EXPORT_API WatchHolder : public Watch::IWatchEventListener {
+class EXPORT_API WatchHolder : public Watch::IEvent {
  public:
   WatchHolder(Evas_Object* win);
   int Launch(app_control_h control, bool background, bundle* extra);
@@ -39,12 +39,11 @@ class EXPORT_API WatchHolder : public Watch::IWatchEventListener {
   void DisableRendering(int timeout);
   const std::list<std::shared_ptr<Watch>>& GetStack();
   Watch* GetCurrent();
-  void OnWatchDead(Watch& watch);
-  void OnWatchLaunched(Watch& watch);
-  void OnWatchBound(Watch& watch);
-  void OnWatchAdded(Watch& watch, Evas_Object* image) override;
-  void OnWatchUpdated(Watch& watch, Evas_Object* image) override;
-  void OnWatchRemoved(Watch& watch, Evas_Object* image) override;
+  void OnDead(const Watch& watch);
+  void OnBound(const Watch& watch);
+  void OnAdded(const Watch& watch) override;
+  void OnUpdated(const Watch& watch) override;
+  void OnRemoved(const Watch& watch) override;
 
  private:
   static int OnDeadSignal(const char *endpoint, aul_app_com_result_e e,