From f4ffe14bfa8f1391912f8aced81a90858f7aeb9f Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 16 Jul 2018 16:36:26 +0800
Subject: [PATCH] udpate

---
 src/main/ui/service_client.html       |  33 ++++----
 src/main/ui/service_contact_list.html | 112 ++++++++++++++------------
 src/main/ui/service_customer.html     |  24 +++---
 3 files changed, 92 insertions(+), 77 deletions(-)

diff --git a/src/main/ui/service_client.html b/src/main/ui/service_client.html
index 8570863a3..0941d270d 100644
--- a/src/main/ui/service_client.html
+++ b/src/main/ui/service_client.html
@@ -3,22 +3,27 @@
 <script src="https://g.alicdn.com/aliww/ww/json/json.js" charset="utf-8"></script>
 <![endif]-->
 <!-- 自动适配移动端与pc端 -->
-<script src="https://g.alicdn.com/aliww/??h5.openim.sdk/1.0.6/scripts/wsdk.js,h5.openim.kit/0.3.3/scripts/kit.js" charset="utf-8"></script>
+<script src="https://g.alicdn.com/aliww/??h5.openim.sdk/1.0.6/scripts/wsdk.js,h5.openim.kit/0.3.3/scripts/kit.js"
+        charset="utf-8"></script>
 <script>
-    window.uid='taki';
-    window.touid='mitsuha';
-    window.onload = function(){
+    window.uid = 'taki';
+    window.touid = 'mitsuha';
+    window.onload = function () {
         WKIT.init({
-    container: document.getElementById('J_demo'),
-    width: 700,
-    height: 500,
-    uid: window.uid,
-    appkey: 24960261,
-    credential: 'xxxxxx',
-    touid: window.touid,
-    logo: 'http://img.alicdn.com/tps/i3/TB12LD9IFXXXXb3XpXXSyFWJXXX-82-82.png',
-    pluginUrl: 'http://192.168.0.43:9001/service_contact_list.html?uid='+window.uid
-});
+                      container: document.getElementById('J_demo'),
+                      width: 700,
+                      height: 500,
+                      uid: window.uid,
+                      appkey: 24960261,
+                      credential: 'xxxxxx',
+                      touid: window.touid,
+                      logo: 'http://img.alicdn.com/tps/i3/TB12LD9IFXXXXb3XpXXSyFWJXXX-82-82.png',
+                      pluginUrl: 'http://192.168.0.43:9001/service_contact_list.html?uid='
+                                 + window.uid,
+                      onMsgReceived: function (data) {
+                          document.getElementById("J_wkitPluginFrame").contentWindow.updateContractList(data);
+                      }
+                  });
     }
 </script>
 </html>
\ No newline at end of file
diff --git a/src/main/ui/service_contact_list.html b/src/main/ui/service_contact_list.html
index 8e4a1734a..7769b5d72 100644
--- a/src/main/ui/service_contact_list.html
+++ b/src/main/ui/service_contact_list.html
@@ -9,24 +9,24 @@
 
 <script>
     var unreadMap = {};
-    var sdk = new WSDK();
+    var sdk =  new WSDK();
 
     var queryParam = getQueryString();
+
     function login() {
         sdk.Base.login({
-                           uid: queryParam['uid'],
-                           appkey: '24960261',
-                           credential: 'xxxxxx',
-                           timeout: 4000,
-                           success: function (data) {
-                               initUnreadMsgAndContact();
-                               console.log('login success', data);
-                               sdk.Base.startListenAllMsg();
-                           },
-                           error: function (error) {
-                               console.log('get login msg count fail', error);
-                           }
-                       });
+               uid: queryParam['uid'],
+               appkey: '24960261',
+               credential: 'xxxxxx',
+               timeout: 4000,
+               success: function (data) {
+                   initUnreadMsgAndContact();
+                   console.log('login success', data);
+               },
+               error: function (error) {
+                   console.log('get login msg count fail', error);
+               }
+           });
     }
 
     function loadContactList() {
@@ -44,51 +44,51 @@
 
     function initUnreadMsgAndContact() {
         sdk.Base.getRecentContact({
-                                      count: 40,
-                                      success: function (data) {
-                                          console.log('get contact msg count success', data);
+              count: 40,
+              success: function (data) {
+                  console.log('get contact msg count success', data);
 
-                                          var cnts = data.data.cnts;
-                                          for (var i = cnts.length - 1; i >= 0; i--) {
-                                              unreadMap[sdk.Base.getNick(cnts[i].to)] = 0;
-                                          }
-                                          getUnreadMsgCount();
-                                      },
-                                      error: function (error) {
-                                          console.log('get contact msg count fail', error);
-                                      }
+                  var cnts = data.data.cnts;
+                  for (var i = cnts.length - 1; i >= 0; i--) {
+                      unreadMap[sdk.Base.getNick(cnts[i].to)] = 0;
+                  }
+                  getUnreadMsgCount();
+              },
+              error: function (error) {
+                  console.log('get contact msg count fail', error);
+              }
                                   })
     }
 
     function getUnreadMsgCount() {
         sdk.Base.getUnreadMsgCount({
-                                       count: 40,
-                                       success: function (data) {
-                                           console.log('get unread msg count success', data);
-                                           var unreads = data.data;
-                                           for (var i = unreads.length - 1; i >= 0; i--) {
-                                               unreadMap[sdk.Base.getNick(unreads[i].contact)] =
-                                                   unreads[i].msgCount;
-                                           }
-                                           loadContactList();
-                                       },
-                                       error: function (error) {
-                                           console.log('get recent contact fail', error);
-                                       }
-                                   });
+                count: 40,
+                success: function (data) {
+                    console.log('get unread msg count success', data);
+                    var unreads = data.data;
+                    for (var i = unreads.length - 1; i >= 0; i--) {
+                        unreadMap[sdk.Base.getNick(unreads[i].contact)] =
+                            unreads[i].msgCount;
+                    }
+                    loadContactList();
+                },
+                error: function (error) {
+                    console.log('get recent contact fail', error);
+                }
+            });
     }
 
     function setReadState(touid) {
         sdk.Chat.setReadState({
-                                  touid: touid,
-                                  timestamp: Math.floor((+new Date()) / 1000),
-                                  success: function (data) {
-                                      console.log('set read state success', data);
-                                  },
-                                  error: function (error) {
-                                      console.log('set read state fail', error);
-                                  }
-                              });
+               touid: touid,
+               timestamp: Math.floor((+new Date()) / 1000),
+               success: function (data) {
+                   console.log('set read state success', data);
+               },
+               error: function (error) {
+                   console.log('set read state fail', error);
+               }
+           });
     }
 
     function startListenMsg(touid) {
@@ -106,16 +106,26 @@
             item = null,
             len = items.length;
 
-        for(var i = 0; i < len; i++) {
+        for (var i = 0; i < len; i++) {
             item = items[i].split("=");
             var name = decodeURIComponent(item[0]),
                 value = decodeURIComponent(item[1]);
-            if(name) {
+            if (name) {
                 args[name] = value;
             }
         }
         return args;
     }
+    function updateContractList(data) {
+        var msg =data.msgs[0];
+        var msg_uid = sdk.Base.getNick(msg.from);
+        if(unreadMap[msg_uid]){
+            unreadMap[msg_uid] = unreadMap[msg_uid]+1;
+        }else {
+            unreadMap[msg_uid] = 1;
+        }
+        loadContactList();
+    }
 </script>
 <script>
     window.onload = function () {
diff --git a/src/main/ui/service_customer.html b/src/main/ui/service_customer.html
index 660343ad7..804776866 100644
--- a/src/main/ui/service_customer.html
+++ b/src/main/ui/service_customer.html
@@ -3,20 +3,20 @@
 <script src="https://g.alicdn.com/aliww/ww/json/json.js" charset="utf-8"></script>
 <![endif]-->
 <!-- 自动适配移动端与pc端 -->
-<script src="https://g.alicdn.com/aliww/??h5.openim.sdk/1.0.6/scripts/wsdk.js,h5.openim.kit/0.3.3/scripts/kit.js" charset="utf-8"></script>
+<script src="https://g.alicdn.com/aliww/??h5.openim.sdk/1.0.6/scripts/wsdk.js,h5.openim.kit/0.3.3/scripts/kit.js"
+        charset="utf-8"></script>
 <script>
-    window.onload = function(){
+    window.onload = function () {
         WKIT.init({
-    container: document.getElementById('J_demo'),
-    width: 700,
-    height: 500,
-    uid: 'mitsuha',
-    appkey: 24960261,
-    credential: 'xxxxxx',
-    touid: 'taki',
-    logo: 'http://img.alicdn.com/tps/i3/TB12LD9IFXXXXb3XpXXSyFWJXXX-82-82.png',
-    pluginUrl: 'http://www.taobao.com/market/seller/openim/plugindemo.php'
-});
+             container: document.getElementById('J_demo'),
+             width: 700,
+             height: 500,
+             uid: 'mitsuha',
+             appkey: 24960261,
+             credential: 'xxxxxx',
+             touid: 'taki',
+             logo: 'http://img.alicdn.com/tps/i3/TB12LD9IFXXXXb3XpXXSyFWJXXX-82-82.png',
+         });
     }
 </script>
 </html>
\ No newline at end of file