修复BUG问题

src/main/index.js

@@ -290,7 +290,10 @@ app.on('activate', () => {
         createWindow()
     }
 })
-
+ipc.on('reconnect',function(event){
+    nim=null
+    initNIM(global.LOGINUSER.ImAccount, global.LOGINUSER.ImToken)
+})
 ipc.on('loginSuccess', function(event, userInfo) {
     initNIM(userInfo.ImAccount, userInfo.ImToken)
     registScrollerHotKey()
@@ -406,7 +409,7 @@ ipc.on('loginSuccess', function(event, userInfo) {
 
             app.setAsDefaultProtocolClient('Woyou')
         } catch (error) {
-            console.log(error)
+            // console.log(error)
         }
     }, 1000 * 60 * 10)
 })
@@ -652,11 +655,11 @@ ipc.on('getNetworkImage', function(event, url) {
             var base64Img = data.toString('base64');
             let img = nativeImage.createFromDataURL(`data:image/png;base64,${base64Img}`)
             clipboard.writeImage(img)
-            console.log('结束');
         });
     });
 })
-ipc.on('getNetworkImageBASE64', function (event, img) {
+ipc.on('getNetworkImageBASE64', function(event, imgUrl) {
+    let img = nativeImage.createFromDataURL(imgUrl)
     clipboard.writeImage(img)
 })
 ipc.on('screens-session', function(event) {
@@ -723,7 +726,7 @@ ipc.on('read-clip', function(event) {
                     getDialogWindows()
                 }
             } else {
-                console.log(error)
+                // console.log(error)
             }
         })
     }
@@ -811,7 +814,7 @@ let getMainWinodw = function(isLoad) {
             mainWindow.show()
             mainWindow.setAlwaysOnTop(true)
             mainWindow.setAlwaysOnTop(false)
-            mainWindow.webContents.openDevTools(true);
+            //mainWindow.webContents.openDevTools(true);
             //getNoticeWindows()
         })
     }
@@ -967,7 +970,7 @@ let getAddNewUserWinodes = function() {
         addNewUserWinodes.setMenu(null)
         addNewUserWinodes.once('ready-to-show', () => {
             addNewUserWinodes.show()
-            addNewUserWinodes.webContents.openDevTools(true);
+            //addNewUserWinodes.webContents.openDevTools(true);
         })
     } else {
         addNewUserWinodes.focus()
@@ -1086,12 +1089,12 @@ let initNIM = function(uid, token) {
         })
 
         function onConnect() {
-
+            console.log('OK.......')
         }
 
         function onWillReconnect(obj) {
             // 此时说明 SDK 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接
-
+            console.log('Try........')
         }
 
         function onDisconnect(error) {
@@ -1115,7 +1118,8 @@ let initNIM = function(uid, token) {
         }
 
         function onError(error) {
-            console.log(error);
+            // console.log(error);
+            console.log('error........')
         }
     } catch (error) {
 

src/plugin/plugin.js

@@ -47,7 +47,8 @@ export default {
           headers: {
               'Content-Type':'application/json', 
               'Referer-Viitto':this.$route.path
-          }
+          },
+          timeout:1000*15
       })
       .then(res =>  {
           if (res.resultCode == 10000 || res.resultCode == 10001) {

src/renderer/components/index.vue

@@ -29,7 +29,7 @@
         </div>
       </div>
       <div class="rightPannel">
-        <div class="navtool">
+        <div class="navtool" :class="{'errornet':netState}">
           <div class="child__item navname">{{chosenState.name}}</div>
           <div class="child__item">
             <div class="header__opera">
@@ -44,6 +44,11 @@
               </span>
             </div>
           </div>
+          <div class="error-msg">
+            当前网络不稳定，你已经和组织失去联系，稍后系统将自动链接或者
+            <span class="goconnect" v-if="!reconnecloading" @click="reconnect">手动呼叫组织</span>
+            <span v-else>正在呼叫组织</span>
+          </div>
         </div>
         <div class="contentarea">
           <msg :user=user v-show="chosenState.val==0"></msg>
@@ -91,7 +96,8 @@ export default {
         top:0,
         left:0,
         currentAccount:''
-      }
+      },
+      reconnecloading:false
     };
   },
   mounted() {
@@ -170,7 +176,6 @@ export default {
       //
     })
     document.getElementById('homebox').addEventListener("click", function(e) {
-      console.log(e.target.className.indexOf('u-circle'))
       if ((that.usercardInfo.searchName!="" || that.atInfo.atName != '') && e.target.className.indexOf('u-circle') == -1) {
         that.usercardInfo.searchName = ""
         that.atInfo.atName = ''
@@ -179,6 +184,15 @@ export default {
     });
   },
   methods: {
+    reconnect(){
+      this.reconnecloading=true
+      this.$store.dispatch("logout");
+      this.$store.dispatch("connect");
+      this.$electron.ipcRenderer.send('reconnect')
+      setTimeout(() => {
+        this.reconnecloading=false
+      }, 8*1000);
+    },
     atMsg(){
       console.log(11111111111111)
       this.MsgBus.$emit('send-at-name', this.atInfo.atName)
@@ -212,6 +226,11 @@ export default {
       this.MsgBus.$emit("dispose-session")
       this.$electron.remote.getCurrentWindow().hide();
     }
+  },
+  computed: {
+    netState(){
+      return this.$store.state.isNetError
+    }
   }
 };
 </script>
@@ -310,6 +329,36 @@ export default {
   display: flex;
   -webkit-app-region: drag !important;
 }
+.homebox .rightPannel .navtool .error-msg{
+  display: none;
+  top: 0px;
+  left: 0px;
+  height: 40px;
+  line-height: 40px;
+  margin:0 130px;
+  text-align: center;
+  font-size: 12px;
+  font-family: 'microsoft yahei';
+  color: #f5f5f5;
+  position: absolute;
+}
+.homebox .rightPannel .navtool .error-msg .goconnect{
+  margin-left: 10px;
+  color: yellow !important;
+  text-decoration: underline;
+  cursor: pointer;
+  -webkit-app-region: no-drag !important;
+}
+
+.homebox .rightPannel .navtool.errornet{
+  background: #d25050 !important;
+}
+.homebox .rightPannel .navtool.errornet .error-msg{
+  display: block;
+}
+.homebox .rightPannel .navtool.errornet *{
+  color: #f1f1f1 !important;
+}
 .homebox .rightPannel .navtool .child__item {
   flex: 1;
 }
@@ -325,7 +374,8 @@ export default {
   top: -2px;
   right: -1px;
   text-align: right;
-  
+  width: 130px;
+    left: inherit;
 }
 .homebox .rightPannel .navtool .child__item .header__opera .opera__item {
   padding: 5px 12px;

src/renderer/components/login.vue

@@ -144,7 +144,12 @@ export default {
             }
             this.loging = false;
           },
-          err => {}
+          err => {
+            this.usermodel.voucher = "";
+            this.errorMsg = '网络请求超时，请检查网络';
+            this.isRemeber = false;
+            this.loging = false;
+          }
         );
       }
     },
@@ -199,6 +204,9 @@ export default {
   right: 0;
   animation: breathe 0.5s;
 }
+.login-box .el-alert--error{
+  color: rgb(251, 197, 197);
+}
 @-webkit-keyframes breathe {
   0% {
     bottom: -26px;

src/renderer/components/msssage/chateditor.vue

@@ -327,7 +327,7 @@ export default {
           teamId: this.teamInfo.teamId,
           custom: JSON.stringify(custom),
           done: (error, team) => {
-            console.log('serverCustom Error:',error)
+            // console.log('serverCustom Error:',error)
           }
         }
       })

src/renderer/components/msssage/chatitem.vue

@@ -328,7 +328,6 @@ export default {
         var ctx = canvas.getContext("2d");
         ctx.drawImage(img, 0, 0, img.width, img.height);
         var dataURL = canvas.toDataURL("image/png");
-        alert(dataURL)
         this.$electron.ipcRenderer.send("getNetworkImageBASE64", dataURL);
         return
     },
@@ -337,7 +336,7 @@ export default {
         img.src = src;  //此处自己替换本地图片的地址
         let _this = this;
         img.onload =function() {
-          // console.log(_this.getBase64Image(img))
+          _this.getBase64Image(img)
         }
     },
     setClipboard() {

src/renderer/components/msssage/chatlist.vue

@@ -182,7 +182,7 @@ export default {
   box-sizing: border-box;
   margin: 0;
   padding: 20px;
-  padding-right: 12px;
+  padding-right: 12px !important;
   height: 100%;
   overflow-y: auto !important;
   overflow-x:hidden !important;

src/renderer/components/msssage/index.vue

@@ -169,8 +169,8 @@
       <right-menu @update-session="updateSession" v-if="menu.show" :config='menu' :top="menu.t" :left="menu.l" :session="menu.s" ></right-menu>
     </div>
     <div class="messagebox">
-      <net-error v-if="netState"></net-error>
-      <div v-else-if="currentSession.id!=''">
+      <!-- <net-error v-if="netState"></net-error> -->
+      <div v-if="currentSession.id!=''">
         <chat :id="currentSession.id" :idServer='atIds' @update-session="updateSession"></chat>
       </div>
       <notice v-else-if="openNoticeState" @clear-msg='clearNotice'></notice>
@@ -312,7 +312,6 @@ export default {
       this.TOPSESSION = topSession;
     },
     enterChat(session) {
-      console.log(session)
       if(session.id!=this.currentSession.id){
         this.atIds=null
         pageUtil.openDown=true
@@ -358,7 +357,7 @@ export default {
               teamId: teamInfo.teamId,
               custom: JSON.stringify(custom),
               done: (error, team) => {
-                console.log('serverCustom Error:',error)
+                // console.log('serverCustom Error:',error)
               }
             }
           })
@@ -426,8 +425,6 @@ export default {
       return isplay;
     },
     createSession(obj){
-      console.log('obj.id', obj.id)
-      console.log('this.createSessions', this.createSessions)
       let h=null
       this.sessionlist.forEach(x=>{
         if(x.id==obj.id){
@@ -468,7 +465,6 @@ export default {
     });
     this.MsgBus.$on("forward",function(msg){
       that.forwardMsgInfo=msg
-      console.log(that.forwardMsgInfo)
       that.$electron.ipcRenderer.send("open-forward-msg",that.sessionlist);
     })
     this.MsgBus.$on("goForward",function(sessions){
@@ -674,10 +670,10 @@ export default {
       }
       this.newMsgList = unreadList;
       return sessionlist;
-    },
-    netState(){
-      return this.$store.state.isNetError
     }
+    // netState(){
+    //   return this.$store.state.isNetError
+    // }
   }
 };
 </script>

src/renderer/components/msssage/newMsgPop.vue

@@ -45,12 +45,7 @@ export default {
   },
   methods: {
     setSessionlist(){
-      let sessionlist = this.$electron.remote.getGlobal("NEWMESSAGE");
-      let list = [];
-      for(let i = 0; i < 4; i ++) {
-        list.push(sessionlist[i])
-      }
-      this.sessionlist = list
+      this.sessionlist = this.$electron.remote.getGlobal("NEWMESSAGE")
     },
     openMsg(session) {
       var sessions = new Array();

src/renderer/components/team/addNewUser.vue

@@ -279,7 +279,7 @@ export default {
             if(this.teamMembers.length<200)
               this.teamMembers.push(member);
           }else{
-            console.log('没有账号')
+            // console.log('没有账号')
           }
         });
         this.$refs.tree.setCheckedKeys([]);
@@ -350,7 +350,7 @@ export default {
   top: 0px;
   right: 0px;
   text-align: right;
-  
+  height: 24px !important;
 }
 .addNewUser .split {
   position: absolute;

src/renderer/components/team/forwardMsg.vue

@@ -156,7 +156,6 @@ export default {
                 x.groupType=3
                 return x;
               });
-              console.log(this.searchResults)
             }
           },
           err => {}

src/renderer/components/team/maillist.vue

@@ -262,7 +262,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             this.webAllpartList = res.data.data;
-            console.log(res.data.data);
           } else {
           }
         },

src/renderer/components/team/usercard.vue

@@ -58,12 +58,10 @@ export default {
   },
   mounted() {
     this.getUserInfo();
-    console.log(this.usercard)
   },
   methods: {
     openChat(){
       let _this = this
-      console.log(_this.user.id)
       this.MsgBus.$emit("change-create-session", _this.user);
     },
     getUserInfo() {

src/renderer/components/tools/contenteditor.vue

@@ -89,7 +89,6 @@ export default {
   mounted() {
     let that = this;
     this.MsgBus.$on("send-at-name", function(name) {
-      console.log(name)
       document.querySelector('#msgEditorBox').innerText = document.querySelector('#msgEditorBox').innerText + `@${name} `
     })
     this.MsgBus.$on("close-copy", function() {
@@ -284,7 +283,6 @@ export default {
         });
     },
     createImage(dataurl){
-      console.log('图片来了！！！！！！！！！！！', dataurl)
       var strLen = dataurl.length;
       var size = strLen-(strLen/8)*2;
       let f = {

src/renderer/components/tools/mousemenu.vue

@@ -66,7 +66,7 @@ export default {
           teamId: this.session.id.split("-")[1],
           muteTeam: !this.session.isMute,
           muteNotiType: !this.session.isMute ? 1 : 0,
-          done: (error, team) => {console.log(error)}
+          done: (error, team) => {}
         }
       });
       this.config.show = false;

src/renderer/components/tools/scrollerhot.vue

@@ -31,7 +31,6 @@ export default {
   mounted() {
     let that = this;
     this.imgPath = this.$electron.remote.getGlobal("DEFAULT_SCREENSHOT_PATH");
-    console.log(this.imgPath,'imgPath')
     document.onkeydown = function(event) {
       var e = event || window.event || arguments.callee.caller.arguments[0];
       if (e && e.keyCode == 27) {

src/store/actions/chatroomMsgs.js

@@ -102,7 +102,7 @@ export function sendChatroomFileMsg ({state, commit}, obj) {
     },
     uploaderror: function () {
       fileInput.value = ''
-      console && console.log('上传失败')
+      // console && console.log('上传失败')
     },
     uploaddone: function(error, file) {
       fileInput.value = ''

src/store/actions/index.js

@@ -85,12 +85,13 @@ export default {
 
     // 用户触发的登出逻辑
     logout({ state, commit }) {
-        cookie.delCookie('uid')
-        cookie.delCookie('sdktoken')
+        // cookie.delCookie('uid')
+        // cookie.delCookie('sdktoken')
         if (state.nim) {
             state.nim.disconnect()
+            state.nim=null
         }
-        pageUtil.turnPage('', 'login')
+        //pageUtil.turnPage('', 'login') 
     },
 
     // 初始化 重新连接SDK

src/store/actions/initChatroomSDK.js

@@ -32,13 +32,13 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
         onerror: function onChatroomError (error, obj) {
           dispatch('hideLoading')
           if (error) {
-            alert('网络连接状态异常')
+            //alert('网络连接状态异常')
             location.href='#/room'
           }
         },
         onwillreconnect: function onChatroomWillReconnect (obj) {
           // 此时说明 `SDK` 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接
-          console.log('即将重连', obj)
+          // console.log('即将重连', obj)
         },
         ondisconnect: function onChatroomDisconnect (error) {
           // 此时说明 `SDK` 处于断开状态, 切换聊天室也会触发次回调
@@ -51,13 +51,13 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
                 // 如果单用聊天室功能需要在此做处理
                 break;
               case 13003:
-                alert('抱歉，你已被主播拉入了黑名单')
+                //alert('抱歉，你已被主播拉入了黑名单')
                 location.href='#/room'
                 break
                 // 被踢, 请提示错误后跳转到登录页面
               case 'kicked':
                 if (error.reason === 'managerKick') {
-                  alert('你已被管理员移出聊天室')
+                  //alert('你已被管理员移出聊天室')
                   location.href='#/room'
                 } else if (error.reason === 'blacked') {
                   alert('你已被管理员拉入黑名单，不能再进入')
@@ -65,7 +65,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
                 }
                 break;
               default:
-                console.log(error.message);
+                // console.log(error.message);
                 break
             }
           }
@@ -75,7 +75,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
       })
     }
   } else {
-    alert('没有聊天室地址')
+    //alert('没有聊天室地址')
   }
 }
 

src/store/actions/initNimSDK.js

@@ -42,14 +42,15 @@ export function initNimSDK({ state, commit, dispatch }, loginInfo) {
         // 连接上以后更新uid
         commit('updateUserUID', loginInfo)
         commit('updateNetError',false)
+        console.log('链接完成......')
       }
     },
     onerror: function onError (event) {
       commit('updateNetError',true)
-      console.log('断网了')
     },
     onwillreconnect: function onWillReconnect() {
       commit('updateNetError',true)
+      console.log('尝试中.........')
     },
     ondisconnect: function onDisconnect (error) {
       switch (error.code) {
@@ -71,7 +72,6 @@ export function initNimSDK({ state, commit, dispatch }, loginInfo) {
           pageUtil.turnPage(errorMsg, 'login')
           break
         default:
-          console.log('断网了2')
           break
       }
     },

src/store/actions/session.js

@@ -81,7 +81,6 @@ export function setCurrSession ({state, commit, dispatch}, sessionId) {
     if (nim) {
       // 如果在聊天页面刷新，此时还没有nim实例，需要在onSessions里同步
       nim.setCurrSession(sessionId)
-      console.log('初始化了')
       commit('updateCurrSessionMsgs', {
         type: 'init',
         sessionId

src/store/actions/sysMsgs.js

@@ -44,7 +44,6 @@ export function onSysMsgUnread (obj) {
 }
 
 export function onCustomSysMsgs (customSysMsgs) {
-    console.log(customSysMsgs)
   if (!Array.isArray(customSysMsgs)) {
     customSysMsgs = [customSysMsgs]
   }

src/store/actions/team.js

@@ -117,7 +117,6 @@ export function onTeamMsgReceipt(obj) {
       store.commit('updateSingleTeamMsgReads', item)
     }
   })
-  console.log('群消息回执通知' + obj)
 }
 
 // 进入可配置的群信息设置页，进入前改变state中的配置信息，进入页面后读取配置信息更新视图
@@ -192,7 +191,6 @@ export function checkTeamMsgReceipt({state}, msgs) {
     nim.sendTeamMsgReceipt({
       teamMsgReceipts: needToPeceiptList,
       done: (err, obj, content) => {
-        console.log('标记群组消息已读' + (!err ? '成功' : '失败'));
         if (!err) {
           store.commit('updateSentReceipedMap', needToPeceiptList)
         }
@@ -226,9 +224,10 @@ export function getTeamMsgReads({ state }, needQuery) {
     teamMsgReceipts: needQuery,
     done: (error, obj, content) => {
       if (error) {
-        console.log('获取群组消息已读' + error)
+        //console.log('获取群组消息已读' + error)
+        let a=0;
       }else {
-        console.log('获取群组消息已读：', content)
+        //('获取群组消息已读：', content)
         store.commit('updateTeamMsgReads', content)
       }
     }

src/store/mutations/index.js

@@ -334,7 +334,7 @@ export default {
       if (obj.msgs[0]) {
         state.currSessionLastMsg = obj.msgs[0]
       }
-      console.log(state.currSessionMsgs)
+      //console.log(state.currSessionMsgs)
       store.dispatch('checkTeamMsgReceipt', currSessionMsgs)
     } else if (type === 'replace') {
       let msgLen = state.currSessionMsgs.length

src/utils/index.js

@@ -350,7 +350,8 @@ Utils.showTips = function(msg){
       dom.style.display='none'
     }, 2000);
   }else{
-    console.log('没有找到div',dom.style.display)
+    //console.log('没有找到div',dom.style.display)
+    let a=0
   }
 }