From c9cc9562e4a0d943db7479e869c7f6853c49004a Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Tue, 1 Mar 2022 15:57:02 +0800
Subject: [PATCH 1/5] * Fix xuanxuan web notification avatar bug #19281.

---
 .../xuan/message/ext/model/class/xuanxuan.class.php          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index fb26efaee9..2d1db5c712 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -131,7 +131,8 @@ class xuanxuanMessage extends messageModel
                 }
 
                 $content = json_encode($contentData);
-                if($target) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender));
+                $avatarUrl = $server . $this->app->getWebRoot() . 'favicon.ico';
+                if($target) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
 
                 if($objectType == 'mr' and is_array($this->lang->message->mr->$actionType) and !empty($object->assignee))
                 {
@@ -139,7 +140,7 @@ class xuanxuanMessage extends messageModel
 
                     $content = json_encode($contentData);
                     $target  = $this->dao->select('id')->from(TABLE_USER)->where('account')->eq($object->assignee)->fetch('id');
-                    if($target) $this->loadModel('im')->messageCreateNotify(array($target), $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender));
+                    if($target) $this->loadModel('im')->messageCreateNotify(array($target), $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
                 }
 
                 if($onlybody) $_GET['onlybody'] = $onlybody;

From 8f408df0f519b3856461cd6862963d16e776169e Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Tue, 1 Mar 2022 17:28:43 +0800
Subject: [PATCH 2/5] * fix zentao chatNotice style.

---
 .../extension/xuan/index/ext/view/index.xuanxuan.html.hook.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php b/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
index ec97683aac..4ebe3fb720 100644
--- a/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
+++ b/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
@@ -48,7 +48,7 @@ if(isset($this->config->xuanxuan->turnon) && $this->config->xuanxuan->turnon)
 <style>
 #chatBtn {padding: 3px; position: relative;}
 #chatBtn .icon {font-size: 24px;}
-#chatNoticeBadge {position: absolute; top: -4px; right: -2px; line-height: 14px; height: 14px; width: 14px; text-align: center; display: block; font-size: 12px; border-radius: 50%; opacity: 0; transform: scale(0); transition: .2s; transition-property: transform, opacity;}
+#chatNoticeBadge {position: absolute; top: -4px; right: -2px; line-height: 14px; height: 14px; min-width: 14px; text-align: center; display: inline-block; font-size: 12px; border-radius: 7px; opacity: 0; transform: scale(0); transition: .2s; transition-property: transform, opacity; padding: 0 2px;}
 #chatNoticeBadge.show {opacity: 1; transform: scale(1);}
 #xx-embed-container {bottom: 40px!important; z-index: 1010!important;}
 #xx-embed-container .xx-embed-has-animation {transition: min-width .5s ease-out, min-height .5s ease-out, transform, opacity!important;}

From e23a1be5705d412ffc2745af8544aea879028f74 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:25:03 +0800
Subject: [PATCH 3/5] * skip merging xuan notifications with contentType of
 text, bug #19668, task #49980.

---
 .../extension/xuan/im/ext/model/class/xuanxuan.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
index 73d50b9ca1..a76a35cc0c 100644
--- a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
@@ -192,7 +192,7 @@ class xuanxuanIm extends imModel
     }
 
     /**
-     * Merge notifications with same actor, objectType, actionType.
+     * Merge notifications with same actor, objectType, actionType. Notifications with contentType of 'text' won't be merged.
      *
      * @param  array  $notificationData
      * @access public
@@ -209,11 +209,16 @@ class xuanxuanIm extends imModel
                 /* Group by $message->content->content->objectType, ...->parentType, ...->action, ...->actor */
                 $contentData = json_decode($message->content);
                 $contentData = json_decode($contentData->content);
+                if($contentData->contentType == 'text')
+                {
+                    $messageGroups[$contentData->contentType][] = $message;
+                    continue;
+                }
                 $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor"][] = $message;
             }
             foreach($messageGroups as $groupKey => $messages)
             {
-                if(count($messages) < 2) continue;
+                if(count($messages) < 2 || $groupKey == 'text') continue;
 
                 $notification = current($messages);
                 array_shift($messages);

From 0d093071839051d4754c64858c102a19d8251bbb Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Fri, 4 Mar 2022 13:48:36 +0800
Subject: [PATCH 4/5] * refactor zentao client navbar context menu to same as
 zentao

---
 module/index/js/index.js                                    | 3 +--
 xuanxuan/extension/xuan/index/ext/js/index/xuanxuan.js      | 6 +++++-
 .../xuan/index/ext/view/index.xuanxuan.html.hook.php        | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/module/index/js/index.js b/module/index/js/index.js
index 72d58ff2b2..1e36902268 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -335,14 +335,13 @@
     function hideTab(appCode)
     {
         var app = openedApps[appCode];
+        app.$app.trigger('hideapp', app);
         if(!app || !app.show) return;
 
         app.$app.hide();
         app.show = false;
         lastOpenedApp = null;
 
-        app.$app.trigger('hideapp', app);
-
         /* Active last app */
         var lastApp = getLastApp(true) || getLastApp();
         showTab(lastApp ? lastApp.code : defaultApp);
diff --git a/xuanxuan/extension/xuan/index/ext/js/index/xuanxuan.js b/xuanxuan/extension/xuan/index/ext/js/index/xuanxuan.js
index 66879a0080..298d6b5bb9 100644
--- a/xuanxuan/extension/xuan/index/ext/js/index/xuanxuan.js
+++ b/xuanxuan/extension/xuan/index/ext/js/index/xuanxuan.js
@@ -18,6 +18,10 @@ if(window.navigator.userAgent.indexOf('xuanxuan') > 0)
 
     $(document).on('showapp', function(e, app)
     {
-        window.open('xxc://extension.zentao-integrated.activeAppMenuItem/' + app.code);
+        window.open('xxc://extension.zentao-integrated.activeAppMenuItem/' + encodeURIComponent(JSON.stringify({id: app.code, openedApps:Object.keys($.apps.openedApps)})));
+    });
+    $(document).on('hideapp', function(e, app)
+    {
+        window.open('xxc://extension.zentao-integrated.hideAppMenuItem/' + encodeURIComponent(JSON.stringify({id: app.code, openedApps:Object.keys($.apps.openedApps)})));
     });
 }
diff --git a/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php b/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
index 4ebe3fb720..a10a4022be 100644
--- a/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
+++ b/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php
@@ -23,7 +23,11 @@ updateAppMenu();
 
 $(document).on('showapp', function(e, app)
 {
-    window.open('xxc://extension.zentao-integrated.activeAppMenuItem/' + app.code);
+    window.open('xxc://extension.zentao-integrated.activeAppMenuItem/' + encodeURIComponent(JSON.stringify({id: app.code, openedApps:Object.keys($.apps.openedApps)})));
+});
+$(document).on('hideapp', function(e, app)
+{
+    window.open('xxc://extension.zentao-integrated.hideAppMenuItem/' + encodeURIComponent(JSON.stringify({id: app.code, openedApps:Object.keys($.apps.openedApps)})));
 });
 </script>
 <?php else: ?>

From a543fe935883c7a5f4bf6d746a99ca87e0ff413b Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Wed, 9 Mar 2022 16:04:35 +0800
Subject: [PATCH 5/5] * refactor emit hideapp event after check app exist

---
 module/index/js/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/index/js/index.js b/module/index/js/index.js
index 1e36902268..e7bbaf93e0 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -335,13 +335,15 @@
     function hideTab(appCode)
     {
         var app = openedApps[appCode];
+        if(!app) return;
         app.$app.trigger('hideapp', app);
-        if(!app || !app.show) return;
+        if(!app.show) return;
 
         app.$app.hide();
         app.show = false;
         lastOpenedApp = null;
 
+
         /* Active last app */
         var lastApp = getLastApp(true) || getLastApp();
         showTab(lastApp ? lastApp.code : defaultApp);