1

App.vue

@@ -27,7 +27,7 @@
     methods: {
       initSysConfig(options) {
         // 获取手机信息
-        this.globalData.systemInfo = uni.getSystemInfoSync()
+        this.globalData.systemInfo = uni.getDeviceInfo()
         this.globalData.os = this.globalData.systemInfo.platform
         // #ifdef APP-PLUS
         plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {

pages/setting/about.vue

@@ -30,10 +30,10 @@
     </view>
     <view class="ptb30">
       <view class="text-center color-blue font-size15">
-        九云科技有限公司《服务协议》
+        开放平台《服务协议》
       </view>
       <view class="text-center font-size15">
-        九云科技 版权所有
+        平台开发者 版权所有
       </view>
       <view class="text-center font-size15">
         Copyright © 2024-2031 NineCloud.

pages/setting/contact.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="nine-content-001">
-    <view class="text-center ptb120">
+    <view class="text-center ptb100">
       <image class="image400" :src="url" mode="scaleToFill" ></image>
-      <view class="font-size18 mt10">微信账号：{{account}}</view>
+      <view class="font-size14 mt10 color-gray">微信账号：{{account}}</view>
     </view>
     <view class="nine-nav-001">
-      <view class="nine-nav-001-item ma10 ptb25">
+      <view class="nine-nav-001-item ptb25">
         <view class="nine-nav-001-item-left">
           <text class="nine-nav-001-item-left-text">联系人</text>
         </view>
@@ -13,7 +13,7 @@
           <text class="nine-nav-001-item-left-text">{{name}}</text>
         </view>
       </view>
-      <view class="nine-nav-001-item ma10 ptb25">
+      <view class="nine-nav-001-item ptb25">
         <view class="nine-nav-001-item-left">
           <text class="nine-nav-001-item-left-text">联系电话</text>
         </view>
@@ -21,15 +21,7 @@
           <text class="nine-nav-001-item-left-text color-blue" @click="callPhone(phone)">{{phone}}</text>
         </view>
       </view>
-      <view class="nine-nav-001-item ma10 ptb25">
-        <view class="nine-nav-001-item-left">
-          <text class="nine-nav-001-item-left-text">微信号</text>
-        </view>
-        <view class="nine-nav-001-item-right">      
-          <text class="nine-nav-001-item-left-text">{{phone}}</text>
-        </view>
-      </view>
-      <view class="nine-nav-001-item ma10 ptb25">
+      <view class="nine-nav-001-item ptb25">
         <view class="nine-nav-001-item-left">
           <text class="nine-nav-001-item-left-text">邮箱账号</text>
         </view>
@@ -38,12 +30,12 @@
         </view>
       </view>
     </view>
-    <view class="ptb30">
+    <view class="ptb20">
       <view class="text-center color-blue font-size15">
-        九云科技有限公司《服务协议》
+        开放平台《服务协议》
       </view>
       <view class="text-center font-size15">
-        九云科技 版权所有
+        平台开发者 版权所有
       </view>
       <view class="text-center font-size15">
         Copyright © 2024-2031 NineCloud.

pages/setting/setting.vue

@@ -2,7 +2,7 @@
   <view class="nine-content-001">
     <!-- 功能列表 -->
     <view class="nine-nav-001">
-      <view class="nine-nav-001-item mt10">
+      <view class="nine-nav-001-item">
         <view class="nine-nav-001-item-left">
           <text class="nine-nav-001-item-left-text">公告中心</text>
         </view>

pages/user/login.vue

@@ -37,11 +37,23 @@
         </view>
         <view class="nine-btn-save-001 ma20" @click="loginClick">登 录</view>
         <!--#ifndef MP-WEIXIN-->
-        <view class="text-center ma20">没有账号?
+        <view class="text-center mt30 mb20">没有账号?
           <span class="ml10 color-blue" @click="registerClick">
             立即注册
           </span>
         </view>
+        <view class="text-center mt30 mb20">
+          <span class="ml10 color-blue" @click="visitorLogin">
+            演示账号登录
+          </span>
+        </view>
+        <!--#endif-->
+        <!--#ifdef MP-WEIXIN-->
+        <view class="text-center mt30 mb20">
+          <span class="ml10 color-blue" @click="wxLoginClick">
+            微信一键登录
+          </span>
+        </view>
         <!--#endif-->
       </view>
     </view>
@@ -131,6 +143,12 @@
           this.verifyText = "发送验证码";
         }
       },
+      visitorLogin(){
+        this.loginType = 0;
+        this.userName = "visitor";
+        this.password = "visitor";
+        this.loginClick();
+      },
       loginClick(){
         if(!this.userName){
           this.usernamefocus();

static/style/nine-base-001.scss

@@ -27,12 +27,16 @@
 
 .color-red{ color: red }
 .color-green{ color: green }
+.color-darkgreen{ color: darkgreen }
 .color-white{ color: white }
 .color-gray{ color: gray }
 .color-blue{ color: blue }
+.color-lightblue{ color: lightblue }
 .color-yellow{ color: yellow }
 .color-black{ color: black }
 .color-f1f1f1{ color: #f1f1f1 }
+.color-0294ee{ color: #0294ee }
+.color-799dff{ color: #799dff }
 
 .bgcolor-gray{ background-color: gray }
 .bgcolor-green{ background-color: green }
@@ -47,6 +51,7 @@
 .bgcolor-eef0ff{ background-color: #eef0ff }
 .bgcolor-ff4769{ background-color: #ff4769 }
 .bgcolor-f1f1f1{ background-color: #f1f1f1 }
+.bgcolor-0294ee{ background-color: #0294ee }
 
 .border-gray{ border: 3rpx solid gray }
 .border-lightblue{ border: 3rpx solid lightblue }
@@ -60,7 +65,9 @@
 .border-eef0ff{ border: 3rpx solid #eef0ff }
 .border-ff4769{ border: 3rpx solid #ff4769 }
 .border-f1f1f1{ border: 3rpx solid #f1f1f1 }
+.border-0294ee{ border: 3rpx solid #0294ee }
 
+.border-radius5{ border-radius: 5rpx }
 .border-radius10{ border-radius: 10rpx }
 .border-radius50{ border-radius: 50% }
 
@@ -150,6 +157,7 @@
 .ptb0{ padding-top: 0rpx; padding-bottom: 0rpx }
 .ptb2{ padding-top: 2rpx; padding-bottom: 2rpx }
 .ptb5{ padding-top: 5rpx; padding-bottom: 5rpx }
+.ptb8{ padding-top: 8rpx; padding-bottom: 8rpx }
 .ptb10{ padding-top: 10rpx; padding-bottom: 10rpx }
 .ptb15{ padding-top: 15rpx; padding-bottom: 15rpx }
 .ptb20{ padding-top: 20rpx; padding-bottom: 20rpx }

static/style/nine-base-002.scss

@@ -1,3 +1,30 @@
+.height10{
+  height: 10%;
+}
+.height20{
+  height: 20%;
+}
+.height30{
+  height: 30%;
+}
+.height40{
+  height: 40%;
+}
+.height50{
+  height: 50%;
+}
+.height60{
+  height: 60%;
+}
+.height70{
+  height: 70%;
+}
+.height80{
+  height: 80%;
+}
+.height90{
+  height: 90%;
+}
 .height100{
   height: 100%;
 }
@@ -13,6 +40,9 @@
 .width30{
   width: 30%;
 }
+.width33{
+  width: 33%;
+}
 .width45{
   width: 45%;
 }
@@ -135,6 +165,33 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.desc-style-text {
+  white-space: pre-wrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
+.desc-style-header{
+  white-space: pre-wrap
+}
+.line-clamp-1{
+  -webkit-line-clamp: 1;
+}
+.line-clamp-2{
+  -webkit-line-clamp: 2;
+}
+.line-clamp-3{
+  -webkit-line-clamp: 3;
+}
+.line-clamp-4{
+  -webkit-line-clamp: 4;
+}
+.line-clamp-5{
+  -webkit-line-clamp: 5;
+}
 
 // 不占位隐藏
 .display-none{ display: none }
@@ -165,4 +222,23 @@
   moz-transform: rotate(90deg); /* Firefox */
   webkit-transform: rotate(90deg); /* Safari and Chrome */
   o-transform: rotate(90deg); /* Opera */
+}
+
+.z-index1{
+  z-index: 1;
+}
+.z-index2{
+  z-index: 2;
+}
+.z-index3{
+  z-index: 3;
+}
+.z-index11{
+  z-index: 11;
+}
+.z-index101{
+  z-index: 101;
+}
+.z-index1001{
+  z-index: 1001;
 }

static/style/nine-base-003.scss

@@ -1,5 +1,5 @@
 .nine-nomore-001{
-  padding: 25rpx;
+  padding: 45rpx 25rpx;
   text-align: center;
 }
 .nine-nomore-001-span{

static/style/nine-btn-001.scss

@@ -9,7 +9,7 @@
   padding: 20rpx;
   border-radius: 10rpx;
   color: #fff;
-  background-color: #0000ff;
+  background-color: #0294ee;
   text-align: center;
 }
 // 退出登录

static/style/nine-image-001.scss

@@ -6,6 +6,10 @@
   width: 40rpx;
   height: 40rpx;
 }
+.image45{
+  width: 45rpx;
+  height: 45rpx;
+}
 .image50{
   width: 50rpx;
   height: 50rpx;
@@ -26,6 +30,14 @@
   width: 90rpx;
   height: 90rpx;
 }
+.image100{
+  width: 100rpx;
+  height: 100rpx;
+}
+.image120{
+  width: 120rpx;
+  height: 120rpx;
+}
 .image150{
   width: 150rpx;
   height: 150rpx;
@@ -34,6 +46,14 @@
   width: 200rpx;
   height: 200rpx;
 }
+.image300{
+  width: 300rpx;
+  height: 300rpx;
+}
+.image350{
+  width: 350rpx;
+  height: 350rpx;
+}
 .image400{
   width: 400rpx;
   height: 400rpx;

static/style/nine-list-001.scss

@@ -3,10 +3,46 @@
 }
 .nine-list-001-item{
   background-color: #fff;
-  margin: 10rpx 0;
+  margin-bottom: 10rpx;
   padding: 10rpx 30rpx;
   border-radius: 10rpx;
 }
+.nine-list-001-item-view{
+  display: flex;
+  align-items: center;
+  padding: 10rpx 0;
+}
+.nine-list-001-item-span-line{
+  display: block;
+  width: 5rpx;
+  height: 22rpx;
+  margin-right: 10rpx;
+  border-radius: 3rpx;
+  background-color: #5e96ff;
+}
+.nine-list-001-item-span-point{
+  display: block;
+  width: 10rpx;
+  height: 10rpx;
+  margin-right: 10rpx;
+  border-radius: 50%;
+  background-color: red;
+}
+.nine-list-001-item-input{
+  padding: 15rpx 10rpx;
+  width: calc(100% - 20rpx);
+  background-color: #f9f9f9;
+  border-radius: 10rpx;
+  margin: 5rpx 0;
+}
+.nine-list-001-item-textarea{
+  padding: 10rpx;
+  width: calc(100% - 20rpx);
+  white-space: pre-wrap;
+  background-color: #f9f9f9;
+  border-radius: 10rpx;
+  margin: 5rpx 0;
+}
 .nine-list-001-item-image-image{
   width: 40rpx;
   height: 30rpx;

static/style/nine-nav-001.scss

@@ -12,7 +12,7 @@
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  margin-top: 5rpx;
+  margin-bottom: 5rpx;
   padding: 20rpx 15rpx;
   border-radius: 1rpx;
   border-style: solid;

uni_modules/vrapile-im/pages/chat/chatFriend.vue

@@ -16,9 +16,23 @@
                 <image class="chat-conversation-image-image" v-else :src="userInfo.avatar || defaultAvatar"></image>
               </view>
               <view class="chat-conversation-text">
-                <view class="chat-conversation-text-time" v-if="item.sendType == 1 && item.fromId != userInfo.userId">{{getUserName(item.fromId, item.fromName)}}</view>
-                <view class="chat-conversation-text-time">{{formatTime(item.sendTime)}}</view>
-                <view class="chat-conversation-text-text nine-user-select">{{item.content}}</view>
+                <view class="conversation-text-time" v-if="item.sendType == 1 && item.fromId != userInfo.userId">{{getUserName(item.fromId, item.toId, item.fromName)}}</view>
+                <view class="conversation-text-time">{{formatTime(item.sendTime)}}</view>
+                <view v-if="item.messageType==1" class="chat-conversation-text-text chat-conversation-text-image">
+                  <image lazy-load="true" class="chat-conversation-text-image-image" :src="item.content" mode="widthFix"></image>
+                </view>
+                <view v-else-if="item.messageType==2" class="chat-conversation-text-text chat-conversation-text-emoji">
+                  <template v-for="(image, index) in getEmojiList(item.content)" :key="'image-' + key">
+                    <image lazy-load="true" class="chat-conversation-text-emoji-image" :src="getEmoji(image)"></image>
+                  </template>
+                </view>
+                <view v-else-if="item.messageType==3" class="chat-conversation-text-text chat-conversation-text-voice">
+                  <image class="chat-conversation-text-voice-image" src="/uni_modules/vrapile-im/static/image/chat/voice-right.png" mode="widthFix"></image>
+                  <span class="chat-conversation-text-voice-number" :style="{'width': (40 + item.content*10) + 'rpx'}">{{item.content}}" </span>
+                </view>
+                <view v-else class="chat-conversation-text-text nine-user-select">
+                  {{item.content}}
+                </view>
               </view>
             </view>
           </view>
@@ -30,7 +44,11 @@
         <view @click="handleVoice" class="chat-footer-send-voice">
           <image class="chat-footer-send-image" :src="iconVoice"></image>
         </view>
-        <view v-if="isVoice" @longpress="handleSay" class="chat-footer-send-say">
+        <view v-if="isVoice" class="chat-footer-send-say"
+          @touchstart="handleTouchStart"
+          @touchend="handleTouchEnd"
+          @longpress="startRecord"
+          @contextmenu.prevent="() => {}">
           <span>按住 说话</span>
         </view>
         <view v-else class="chat-footer-send-input">
@@ -68,6 +86,8 @@
         isVoice: false,
         inputText: "",
         
+        startTime: 0,
+        
         // 消息唯一key
         key: null,
         
@@ -168,13 +188,31 @@
       handleVoice() {
         this.isVoice = !this.isVoice;
       },
+      handleTouchStart(e){
+        this.startTime = Date.now();
+        // 阻止默认行为
+        e.preventDefault();
+      },
+      handleTouchEnd(e) {
+        this.handleSay();
+        // 阻止默认行为
+        e.preventDefault();
+      },
+      startRecord(e) {
+        // 阻止默认行为
+        e.preventDefault(); 
+      },
       // 语音消息处理， 暂时先发送个提示
       handleSay() {
+        const duration = Date.now() - this.startTime
+        if (duration < 500) {
+          return
+        }
         let sendInfo = {
           code: 2,
           message: {
-            //消息文件类型 0-文本|1-图片|2-附件|3-语言|4-撤回
-            messageType: 0,
+            //消息文件类型 0-文本|1-图片|2-表情|3-语音|4-视频|5-附件|9-混合|99-撤回
+            messageType: 3,
             //聊天室id
             toId: this.chatObject.id,
             //消息发送人
@@ -182,7 +220,7 @@
             //消息发送人账号
             fromName: this.userInfo.userName,
             //消息内容
-            content: "您发送了一条语音消息",
+            content: Math.ceil(duration/1000),
             //消息类型：0-私聊|1-群聊
             sendType: this.chatObject.type,
             //扩展消息
@@ -195,11 +233,24 @@
       },
       // 表情消息处理， 暂时先发送个提示
       handleEmoji() {
+        let emojiList = [
+          'daxiao.png',
+          'danao.png', 
+          'shengqi.png',
+          'sile.png',
+          'xianwen.png'
+        ]
+        let randomIndex
+        let content = []
+        do{
+          randomIndex = Math.floor(Math.random() * emojiList.length)
+          content.push(emojiList[randomIndex])
+        }while(randomIndex % 3 != 0);
         let sendInfo = {
           code: 2,
           message: {
-            //消息文件类型 0-文本|1-图片|2-附件|3-语言|4-撤回
-            messageType: 0,
+            //消息文件类型 0-文本|1-图片|2-表情|3-语音|4-视频|5-附件|9-混合|99-撤回
+            messageType: 2,
             //聊天室id
             toId: this.chatObject.id,
             //消息发送人
@@ -207,7 +258,7 @@
             //消息发送人账号
             fromName: this.userInfo.userName,
             //消息内容
-            content: "您发送了一个表情消息",
+            content: content,
             //消息类型：0-私聊|1-群聊
             sendType: this.chatObject.type,
             //扩展消息
@@ -224,7 +275,7 @@
           code: 2,
           message: {
             //消息文件类型 0-文本|1-图片|2-附件|3-语言|4-撤回
-            messageType: 0,
+            messageType: 1,
             //聊天室id
             toId: this.chatObject.id,
             //消息发送人
@@ -232,7 +283,7 @@
             //消息发送人账号
             fromName: this.userInfo.userName,
             //消息内容
-            content: "您发送了一个更多的消息",
+            content: this.userInfo.avatar || "https://www.ninecloud.top/unine/static/image/app/nine-app-all.png",
             //消息类型：0-私聊|1-群聊
             sendType: this.chatObject.type,
             //扩展消息
@@ -305,10 +356,18 @@
             this.chatObject["messageList"] = this.messageList;
             let lastMessage = res.data[res.data.length-1];
             this.chatObject["messageLast"] = lastMessage;
+            let content = lastMessage["content"]
+            if(lastMessage["messageType"] == 3){
+              content = "[语音]"
+            }else if(lastMessage["messageType"] == 2){
+              content = "[表情]"
+            }else if(lastMessage["messageType"] == 1){
+              content = "[图片]"
+            }
             if(lastMessage["sendType"] == 0){
-              this.chatObject["messageShow"] = lastMessage["content"];
+              this.chatObject["messageShow"] = content;
             }else{
-              this.chatObject["messageShow"] = store.getters.getUserName(lastMessage["fromId"], lastMessage["fromName"]) + ": " + lastMessage["content"] 
+              this.chatObject["messageShow"] = store.getters.getUserName(lastMessage["fromId"], lastMessage["fromName"]) + ": " + content 
             }
             this.chatObject["messageTime"] = this.formatDate(lastMessage["sendTime"]);
           }
@@ -326,6 +385,19 @@
             this.scrollToBottom();
           }
         });
+      },
+      getEmojiList(content){
+        if(typeof content === 'object'){
+          return content;
+        }
+        try{
+          return JSON.parse(content.replace(/(\w+\.png)/g, '"$1"'));
+        }catch(e){
+          return new Array;
+        }
+      },
+      getEmoji(image){
+        return '/uni_modules/vrapile-im/static/image/emoji/'+image
       }
     }
   }

uni_modules/vrapile-im/pages/home/chatHome.vue

@@ -146,6 +146,7 @@
       // 获取历史消息
       handleHistoryMessage(i, scrollFlag){
         let limit = this.getChatList[i]["messageList"].length + 10;
+        // 后续将作废此接口，改为批量查询/im/message/getMessageByPatchChatKey
         getMessageByChatKey({
           type: this.getChatList[i].type,
           key: this.getChatList[i]["key"],
@@ -156,10 +157,18 @@
             this.getChatList[i]["messageList"] = res.data;
             let lastMessage = res.data[res.data.length-1];
             this.getChatList[i]["messageLast"] = lastMessage;
+            let content = lastMessage["content"]
+            if(lastMessage["messageType"] == 3){
+              content = "[语音]"
+            }else if(lastMessage["messageType"] == 2){
+              content = "[表情]"
+            }else if(lastMessage["messageType"] == 1){
+              content = "[图片]"
+            }
             if(lastMessage["sendType"] == 0){
-              this.getChatList[i]["messageShow"] = lastMessage["content"];
+              this.getChatList[i]["messageShow"] = content;
             }else{
-              this.getChatList[i]["messageShow"] = store.getters.getUserName(lastMessage["fromId"], lastMessage["fromName"]) + ": " + lastMessage["content"] 
+              this.getChatList[i]["messageShow"] = store.getters.getUserName(lastMessage["fromId"], lastMessage["fromName"]) + ": " + content 
             }
             this.getChatList[i]["messageTime"] = this.formatDate(lastMessage["sendTime"]);
           }

uni_modules/vrapile-im/static/style/nine-chat-friend-001.scss

@@ -107,6 +107,50 @@ html, body, #app{
   padding: 5rpx;
   border-radius: 10rpx;
 }
+.chat-conversation-text-image{
+  padding: 5px;
+  width: 100%;
+}
+.chat-conversation-text-image-image{
+  width: 100%;
+}
+.chat-conversation-text-emoji{
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-content: flex-start;
+}
+.chat-conversation-text-emoji-image{
+  width: 80rpx;
+  height: 80rpx;
+  margin: 2rpx;
+}
+.chat-conversation-text-voice{
+  flex-direction: row;
+  align-items: center;
+  padding: 15rpx;
+}
+.chat-conversation-text-voice-number{
+  text-align: left;
+  white-space: nowrap;
+  overflow: hidden;
+  flex: 1;
+}
+.chat-conversation-text-voice-image{
+  margin-right: 25rpx;
+  width: 30rpx;
+  height: 30rpx;
+}
+.chat-conversation-mine .chat-conversation-text-voice{
+  flex-direction: row-reverse;
+}
+.chat-conversation-mine .chat-conversation-text-voice-number{
+  text-align: right;
+}
+.chat-conversation-mine .chat-conversation-text-voice-image{
+  margin-right: 0rpx;
+  margin-left: 25rpx;
+  transform: rotate(180deg);
+}
 
 .chat-footer {
   position: fixed;

uni_modules/vrapile-im/store/modules/chat.js

@@ -104,6 +104,7 @@ const chat = {
               delete itemGroup["updateTime"];
               listGroup.push({type: 1, ...itemGroup});
               // 查询群组人员
+              // 后面将作废此接口 改为批量查询 /im/groupUser/getPatchGroupUser
               getGroupUser(itemGroup.id).then(res2 => {  
                 for(let itemGroupUser of res2.data){
                   delete itemGroupUser["createBy"];

uni_modules/vrapile-im/store/modules/socket.js

@@ -36,10 +36,18 @@ const socket = {
           // if(store.state.user.userInfo.userId && store.state.user.userInfo.userId != message["fromId"]){
             store.state.chat.chatList[i]["messageNum"] += 1;
           // }
+          let content = message["content"]
+          if(message["messageType"] == 3){
+            content = "[语音]"
+          }else if(message["messageType"] == 2){
+            content = "[表情]"
+          }else if(message["messageType"] == 1){
+            content = "[图片]"
+          }
           if(store.state.chat.chatList[i]["type"] == 0){
-            store.state.chat.chatList[i]["messageShow"] = message["content"];
+            store.state.chat.chatList[i]["messageShow"] = content;
           }else{
-            store.state.chat.chatList[i]["messageShow"] = store.getters.getUserName(message["fromId"], message["fromName"]) + ": " + message["content"] 
+            store.state.chat.chatList[i]["messageShow"] = store.getters.getUserName(message["fromId"], message["fromName"]) + ": " + content 
           }
           storage.set(constant.chatList, store.state.chat.chatList);
           break;