111

main.js

@@ -1,22 +1,50 @@
 import Vue from 'vue';
 import App from './App';
-import GoEasy from '@/uni_modules/GOEASY-IM/js_sdk/goeasy-2.13.21.esm.min.js'
+//import GoEasy from '@/uni_modules/GOEASY-IM/js_sdk/goeasy-2.13.21.esm.min.js'
+import GoEasy from '@/uni_modules/GOEASY-IM/js_sdk/goeasy-2.13.24-0.esm.min.js'
 import GRTC from './lib/goeasy-rtc-0.3.7.esm.min.js'
+//import GRTC from './lib/goeasy-2.13.24-0.esm.min.js'
 import request from '@/utils/request.js'
 Vue.prototype.$http = request.http
 Vue.prototype.$http2 = request.http2
 Vue.prototype.$request =request
-GoEasy.init({
-    host:"hangzhou.goeasy.io",//应用所在的区域地址: 【hangzhou.goeasy.io |singapore.goeasy.io】
-    appkey:"BC-729fefdf1ad7417daea8e62b9fce3f74",// common key
-    modules: ['im'],
-    // true表示支持通知栏提醒，false则表示不需要通知栏提醒
-    allowNotification: true //仅有效于app,小程序和H5将会被自动忽略
-});
-GRTC.init(GoEasy);
+console.log("main.js")
+console.log(request.baseUrl)
+var header={};
+header['Content-Type']='application/x-www-form-urlencoded';
+uni.request({
+	method: "POST",
+	url: request.baseUrl + 'imSys/imAppKey',
+	data: {},
+	header: header,
+	dataType: 'json',         
+	}).then((response) => {
+		 let [error, res] = response;
+		 var appKey=res.data.data.appKey
+		 console.log(res.data.data.appKey)
+		GoEasy.init({
+		    host:"hangzhou.goeasy.io",//应用所在的区域地址: 【hangzhou.goeasy.io |singapore.goeasy.io】
+		    appkey:appKey,//"BC-729fefdf1ad7417daea8e62b9fce3f74",// common key
+		    modules: ['im'],
+		    // true表示支持通知栏提醒，false则表示不需要通知栏提醒
+		    allowNotification: true //仅有效于app,小程序和H5将会被自动忽略
+		});
+		GRTC.init(GoEasy);
+		uni.$GoEasy = GoEasy;
+		uni.$GRTC = GRTC;
+		
+		Vue.config.productionTip = false;
+		App.mpType = 'app';
+		const app = new Vue({
+		    ...App
+		});
+		app.$mount();
+		
+		
+	})
+
+
 
-uni.$GoEasy = GoEasy;
-uni.$GRTC = GRTC;
 
 GoEasy.onClickNotification((message) => {
     let currentUrl;
@@ -46,9 +74,3 @@ GoEasy.onClickNotification((message) => {
 
 });
 
-Vue.config.productionTip = false;
-App.mpType = 'app';
-const app = new Vue({
-    ...App
-});
-app.$mount();

pages/groupChat.vue

@@ -377,8 +377,8 @@
             notification: {
               title: this.currentUser.name + '发来一段语音',
               body: '[语音消息]',		// 字段最长 50 字符
-              sound: 'message',
-              badge: '+1'
+             /* sound: 'message',
+              badge: '+1' */
             },
             onProgress: function (progress) {
               console.log(progress)
@@ -444,8 +444,8 @@
             notification: {
               title: this.currentUser.name + '发来一段文字',
               body: body,
-              sound: 'message',
-              badge: '+1'
+             /* sound: 'message',
+              badge: '+1' */
             },
             onSuccess: (message) => {
               this.sendMessage(message);
@@ -466,8 +466,8 @@
               notification: {
                 title: this.currentUser.name + '发来一个视频',
                 body: '[视频消息]',		// 字段最长 50 字符
-                sound: 'message',
-                badge: '+1'
+               /* sound: 'message',
+                badge: '+1' */
               },
               onProgress: function (progress) {
                 console.log(progress)
@@ -494,8 +494,8 @@
                 notification: {
                   title: this.currentUser.name + '发来一张图片',
                   body: '[图片消息]',		// 字段最长 50 字符
-                  sound: 'message',
-                  badge: '+1'
+                 /* sound: 'message',
+                  badge: '+1' */
                 },
                 onProgress: function (progress) {
                   console.log(progress)
@@ -521,8 +521,8 @@
           notification: {
             title: this.currentUser.name + '发来一个订单',
             body: '[订单消息]',
-            sound: 'message',
-            badge: '+1'
+            /* sound: 'message',
+            badge: '+1' */
           },
           onSuccess: (message) => {
             this.otherTypesMessagePanelVisible = false;

pages/inquiry.vue

@@ -66,7 +66,7 @@
 		    <span v-if="imLoginUrlGo">{{conversations.length > 0?"正在加载中":'正在加载中'}}</span>
 			<span v-else>{{conversations.length > 0?"暂无消息":'暂无消息'}}</span>
 		  </view>
-		  
+		 <!-- <view>chushihuaNUm:{{chushihuaNUm}}</view> -->
 		<!-- <view @click="setClipboardData">token:{{token}}</view>
 		<view>imLoginUrlGo:{{imLoginUrlGo}} {{chushihuaNUm}} {{liebNUm}}</view>
 		<view>conversations:{{conversations.length}}</view>
@@ -151,7 +151,7 @@
       if (GoEasy.getConnectionStatus() === 'disconnected') {
         return
       }else{
-		  this.tuichu()
+		 // this.tuichu()
 	  }
       GoEasy.im.off(GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.renderConversations);
     },
@@ -178,7 +178,8 @@
 			 // this.imLoginUrl()
 			  this.imLoginUrlGo=false
 			  this.chushihuaNUm=2
-			  this.logout()
+			  
+			  this.logout2()
 			
             console.log('Failed to connect GoEasy, code:' + error.code + ',error:' + error.content);
           },
@@ -216,19 +217,24 @@
 	  			 }
 	  			});
 	  },
+	  logout2(){
+		  var that=this;
+		 setTimeout(that.logout(), 1000)  
+	  },
 	  logout(){
 		  var that=this;
 		  GoEasy.disconnect({
-		  			 onSuccess: function(){
-		  				 console.log("GoEasy disconnect successfully.")
-						 that.imLoginUrlGo=true
-		  				 that.imLoginUrl()
-		  			 },
-		  			 onFailed: function(error){
-						that.imLoginUrlGo=true
-		  				that.imLoginUrl()
-		  				 console.log("Failed to disconnect GoEasy, code:"+error.code+ ",error:"+error.content);
-		  			 }
+				 onSuccess: function(){
+					 console.log("GoEasy disconnect successfully.")
+					 that.imLoginUrlGo=true
+					 
+					 that.imLoginUrl()
+				 },
+				 onFailed: function(error){
+					that.imLoginUrlGo=true
+					that.imLoginUrl()
+					 console.log("Failed to disconnect GoEasy, code:"+error.code+ ",error:"+error.content);
+				 }
 			});
 	  },
 	  setClipboardData(){
@@ -457,7 +463,7 @@
       },
       chat(conversation) {
 		  console.log(conversation)
-		  var url='https://goeasytest.66km.com.cn/#/pages/privateChatWeb?to=' + conversation.userId+"&token="+this.token+'&supplierName='+conversation.data.name
+		  var url='http://goeasytest.66km.com.cn/#/pages/privateChatWeb?to=' + conversation.userId+"&token="+this.token+'&supplierName='+conversation.data.name
 		  
 		  var standalone = window.navigator.standalone
 		  var userAgent = window.navigator.userAgent.toLowerCase()

pages/privateChat.vue

@@ -407,8 +407,8 @@
             notification: {
               title: this.currentUser.name + '发来一段语音',
               body: '[语音消息]',		// 字段最长 50 字符
-              sound: 'message',
-              badge: '+1'
+              /* sound: 'message',
+              badge: '+1' */
             },
             onProgress: function (progress) {
               console.log(progress)
@@ -473,8 +473,8 @@
             notification: {
               title: this.currentUser.name + '发来一段文字',
               body: body,
-              sound: 'message',
-              badge: '+1'
+             /* sound: 'message',
+              badge: '+1' */
             },
             onSuccess: (message) => {
               this.sendMessage(message);
@@ -495,8 +495,8 @@
               notification: {
                 title: this.currentUser.name + '发来一个视频',
                 body: '[视频消息]',		// 字段最长 50 字符
-                sound: 'message',
-                badge: '+1'
+               // sound: 'message',
+               // badge: '+1'
               },
               onProgress: function (progress) {
                 console.log(progress)
@@ -524,8 +524,8 @@
                 notification: {
                   title: this.currentUser.name + '发来一张图片',
                   body: '[图片消息]',		// 字段最长 50 字符
-                  sound: 'message',
-                  badge: '+1'
+                 /* sound: 'message',
+                  badge: '+1' */
                 },
                 onProgress: function (progress) {
                   console.log(progress)
@@ -551,8 +551,8 @@
           notification: {
             title: this.currentUser.name + '发来一个订单',
             body: '[订单消息]',
-            sound: 'message',
-            badge: '+1'
+           /* sound: 'message',
+            badge: '+1' */
           },
           onSuccess: (message) => {
             this.otherTypesMessagePanelVisible = false;

pages/privateChatG.vue

@@ -405,8 +405,8 @@
             notification: {
               title: this.currentUser.supplierName + '发来一段语音',
               body: '[语音消息]',		// 字段最长 50 字符
-              sound: 'message',
-              badge: '+1'
+              /* sound: 'message',
+              badge: '+1' */
             },
             onProgress: function (progress) {
               console.log(progress)
@@ -471,8 +471,8 @@
             notification: {
               title: this.currentUser.supplierName + '发来一段文字',
               body: body,
-              sound: 'message',
-              badge: '+1'
+             /* sound: 'message',
+              badge: '+1' */
             },
             onSuccess: (message) => {
               this.sendMessage(message);
@@ -493,8 +493,8 @@
               notification: {
                 title: this.currentUser.supplierName + '发来一个视频',
                 body: '[视频消息]',		// 字段最长 50 字符
-                sound: 'message',
-                badge: '+1'
+               /* sound: 'message',
+                badge: '+1' */
               },
               onProgress: function (progress) {
                 console.log(progress)
@@ -521,8 +521,8 @@
                 notification: {
                   title: this.currentUser.supplierName + '发来一张图片',
                   body: '[图片消息]',		// 字段最长 50 字符
-                  sound: 'message',
-                  badge: '+1'
+                  /* sound: 'message',
+                  badge: '+1' */
                 },
                 onProgress: function (progress) {
                   console.log(progress)

pages/privateChatWeb.vue

@@ -367,7 +367,7 @@
 		  				 that.goBackApp()
 		  			 },
 		  			 onFailed: function(error){
-		  				 
+		  				  that.goBackApp()
 		  				 console.log("Failed to disconnect GoEasy, code:"+error.code+ ",error:"+error.content);
 		  			 }
 		      });
@@ -381,9 +381,9 @@
 		  var ios = /iphone|ipod|ipad|mac/.test(userAgent)
 		  var android = /android/.test(userAgent)
 		  if (ios) {
-		  	  			 if ( true) {//!standalone&& !safari
-		  	  			   window.webkit.messageHandlers.goMyNav.postMessage(null)
-		  	  			 }
+				 if ( true) {//!standalone&& !safari
+				   window.webkit.messageHandlers.goMyNav.postMessage(null)
+				 }
 		  } else if (android) {
 		  	  window.android.postMessage()
 		  }
@@ -529,8 +529,8 @@
             notification: {
               title: this.currentUser.name + '发来一段语音',
               body: '[语音消息]',		// 字段最长 50 字符
-              sound: 'message',
-              badge: '+1'
+             /* sound: 'message',
+              badge: '+1' */
             },
             onProgress: function (progress) {
               console.log(progress)
@@ -595,8 +595,8 @@
             notification: {
               title: this.currentUser.name + '发来一段文字',
               body: body,
-              sound: 'message',
-              badge: '+1'
+             /* sound: 'message',
+              badge: '+1' */
             },
             onSuccess: (message) => {
               this.sendMessage(message);
@@ -617,8 +617,8 @@
               notification: {
                 title: this.currentUser.name + '发来一个视频',
                 body: '[视频消息]',		// 字段最长 50 字符
-                sound: 'message',
-                badge: '+1'
+                /* sound: 'message',
+                badge: '+1' */
               },
               onProgress: function (progress) {
                 console.log(progress)

pages/qunfa.vue

@@ -563,8 +563,8 @@
 		  		  notification: {
 		  		    title: this.currentUser.name + '发来一段语音',
 		  		    body: '[语音消息]',		// 字段最长 50 字符
-		  		    sound: 'message',
-		  		    badge: '+1'
+		  		   /* sound: 'message',
+		  		    badge: '+1' */
 		  		  },
 		  		  onProgress: function (progress) {
 		  		    console.log(progress)
@@ -653,8 +653,8 @@
 		  		  notification: {
 		  		    title: this.currentUser.name + '发来一段文字',
 		  		    body: body,
-		  		    sound: 'message',
-		  		    badge: '+1'
+		  		   /* sound: 'message',
+		  		    badge: '+1' */
 		  		  },
 		  		  onSuccess: (message) => {
 		  		    this.sendMessage(message,num);
@@ -691,8 +691,8 @@
 					  notification: {
 					    title: this.currentUser.name + '发来一个视频',
 					    body: '[视频消息]',		// 字段最长 50 字符
-					    sound: 'message',
-					    badge: '+1'
+					    /* sound: 'message',
+					    badge: '+1' */
 					  },
 					  onProgress: function (progress) {
 					    console.log(progress)
@@ -737,8 +737,8 @@
 						  notification: {
 						    title: this.currentUser.name + '发来一张图片',
 						    body: '[图片消息]',		// 字段最长 50 字符
-						    sound: 'message',
-						    badge: '+1'
+						    /* sound: 'message',
+						    badge: '+1' */
 						  },
 						  onProgress: function (progress) {
 						    console.log(progress)