diff --git a/.DS_Store b/.DS_Store
index f7fcacf..5d1d9e1 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/pages.json b/pages.json
index f322b7a..ea02ea7 100644
--- a/pages.json
+++ b/pages.json
@@ -573,6 +573,12 @@
                 "navigationBarBackgroundColor": "#34CE98",
                 "navigationBarTextStyle": "white"
             }
+        },{
+            "path" : "pages/im/chat/chat",
+            "style": {
+                "navigationBarTitleText": "chat",
+                "enablePullDownRefresh": false
+            }
         }
     ],
     "tabBar": {
diff --git a/pages/im/chat/chat.nvue b/pages/im/chat/chat.nvue
new file mode 100644
index 0000000..dd51b43
--- /dev/null
+++ b/pages/im/chat/chat.nvue
@@ -0,0 +1,19 @@
+<template>
+    <view>
+        聊天窗口
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                
+            };
+        }
+    }
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 943b80a..fe4924e 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -204,8 +204,18 @@
                     })
                 })
             },
-            singleCall(e) {
-                CallLib.startSingleCall(this.targetId, e.type, '');
+            singleCall(e) {
+                CallLib.startSingleCall(this.targetId, e.type, '');
+                uni.redirectTo({
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' +
+                        e.mediaType,
+                    success: (err) => {
+                        console.log('跳转视频通话成功');
+                    },
+                    fail: (err) => {
+                        console.log('跳转视频页失败', err);
+                    }
+                })
             },
         }
     };
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 54e6e4f..84b13d1 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -56,7 +56,9 @@
                             {{item}}
                         </view>
                     </view>
-                </view>
+                </view>
+                <!-- navNvue -->
+                <navigator url="./chat/chat">进入NVUE</navigator>
             </block>
         </view>
         <!-- 未登录 -->
diff --git a/pages/im/private/call.vue b/pages/im/private/call.vue
index b548f92..b15c8a9 100644
--- a/pages/im/private/call.vue
+++ b/pages/im/private/call.vue
@@ -3,44 +3,122 @@
         <view class="video">
             <RongCloud-Call-RCUniCallView style="width: 100%;height: 100%" ref="bigVideoView">
             </RongCloud-Call-RCUniCallView>
-        </view>
 
-        <button type="default" @click="accept">接听</button>
-        <button type="default" @click="hangup">挂断</button>
-        <button type="default" @click="toHome">回主页</button>
+            <view class="call-user">
+                <u-avatar :src="userInfo.portraitUrl" size="150" bg-color="#fff"></u-avatar>
+                <view class="nickname">{{userInfo.name}}</view>
+
+                <view v-if="remoteRinging" class="mediaType">
+                    等待对方接听
+                </view>
+                <view v-if="connected" class="mediaType">
+                    已接通
+                </view>
+                <view v-else class="mediaType">
+                    {{ mediaType == 0 ? '邀请您语音通话' : '邀请您视频通话' }}
+                </view>
+            </view>
+
+            <view class="buttons">
+                <view class="btn" v-if="connected" @click="changeMicrophone">麦克风</view>
+                <view class="btn hangup" @click="hangup">挂断</view>
+                <view class="btn" v-if="!connected" @click="accept">接听</view>
+                <view class="btn" v-if="connected" @click="changeSpeaker">扬声器</view>
+            </view>
+        </view>
     </view>
 </template>
 
 <script>
+    import {
+        getFriendInfo
+    } from '@/apis/interfaces/im.js'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
     export default {
         data() {
             return {
                 targetId: '',
-                users: []
+                mediaType: 0, // 0 语音  1 视频
+                users: [],
+                userInfo: {},
+                isOut: false,
+                connected: false,
+                micStatus: false,
+                speStatus: false,
+                remoteRinging: false
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
+            this.mediaType = e.mediaType
+            getFriendInfo(this.targetId).then(res => {
+                this.userInfo = res
+            })
+            // 监听通话链接状态
+            CallLib.onCallConnected((res) => {
+                this.connected = true
+                console.log("通话接通时，当前 call 的详细信息", res)
+            })
+
+            // 通过这个，来判断是主叫还是被叫
+            CallLib.onCallOutgoing((res) => {
+                this.isOut = true
+                console.log("主叫端拨出电话后，当前 call 的详细信息", res)
+            })
+            // 主叫监听对方振铃
+            CallLib.onRemoteUserRinging((res) => {
+                this.remoteRinging = true
+                console.log("主叫端拨出电话，被叫端收到请求，发出振铃响应时触发，对端Id为=>", res.data.userId)
+            })
+            CallLib.onRemoteUserJoined((res) => {
+                this.remoteRinging = false
+                console.log("主叫端拨出电话，被叫端收到请求后，加入通话，被叫端Id为=>", res.data.userId);
+            })
+
+            CallLib.onCallDisconnected((res) => {
+                console.log("挂断成功, 挂断原因=>", res.data.reason)
+                this.hangup()
+            })
+            CallLib.onRemoteUserLeft((res) => {
+                console.log("远端用户挂断，远端Id为=>", res.data.reason)
+                this.hangup()
+            })
+        },
+        onUnload() {
+            CallLib.removeCallOutgoingListener()
+            CallLib.removeCallConnectedListener()
+            CallLib.removeRemoteUserJoinedListener()
+            CallLib.removeCallDisconnectedListener()
+            CallLib.removeRemoteUserLeftListener()
+            CallLib.removeRemoteUserRingingListener()
         },
         methods: {
+            changeMicrophone() {
+                CallLib.enableMicrophone(this.micStatus)
+                this.micStatus = !this.micStatus
+            },
+            changeSpeaker() {
+                CallLib.enableSpeaker(this.speStatus)
+                this.speStatus = !this.speStatus
+            },
             accept() {
                 CallLib.accept()
-
-                CallLib.enableCamera(true, 0)
-
-                const currentCallSession = CallLib.getCurrentCallSession()
-                console.log(currentCallSession);
-                this.users = currentCallSession.users
-                setTimeout(() => {
-                    CallLib.setVideoView(currentCallSession.mine.userId, 'bigVideoView', 0, true)
-                }, 500);
+                // 视频通话，才开摄像头
+                if (this.mediaType == 1) {
+                    const currentCallSession = CallLib.getCurrentCallSession()
+                    this.users = currentCallSession.users
+                    setTimeout(() => {
+                        CallLib.setVideoView(currentCallSession.mine.userId, 'bigVideoView', 0, true)
+                    }, 500);
+                }
             },
             hangup() {
                 CallLib.hangup()
 
                 setTimeout(() => {
-                    uni.navigateBack()
+                    uni.redirectTo({
+                        url: '/pages/im/private/index?targetId=' + this.targetId + '&conversationType=1'
+                    })
                 }, 200);
             },
             toHome() {
@@ -55,6 +133,50 @@
 <style lang="scss" scoped>
     .video {
         width: 100vw;
-        height: 100vw;
+        height: 100vh;
+        position: relative;
+        background: $text-gray;
+
+        .call-user {
+            position: fixed;
+            text-align: center;
+            width: 100%;
+            top: 200rpx;
+            left: 0;
+            display: flex;
+            align-items: center;
+            flex-direction: column;
+
+            .nickname {
+                margin: $margin;
+                font-size: 40rpx;
+            }
+
+            .mediaType {
+                color: $text-gray-m;
+            }
+        }
+
+        .buttons {
+            position: fixed;
+            bottom: 100rpx;
+            width: 100%;
+            display: flex;
+            justify-content: space-around;
+
+            .btn {
+                background: $main-color;
+                width: 132rpx;
+                height: 132rpx;
+                line-height: 132rpx;
+                border-radius: 50%;
+                color: white;
+                text-align: center;
+
+                &.hangup {
+                    background: $uni-color-error;
+                }
+            }
+        }
     }
 </style>
diff --git a/utils/im/index.js b/utils/im/index.js
index 69e4d7e..fe4c925 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -105,7 +105,8 @@ const addListeners = () => {
         console.log("Engine:OnCallReceived=>" + "监听通话呼入, 目标id=>", res.data.targetId);
         console.log('RES', res);
         uni.navigateTo({
-            url: '/pages/im/private/call?targetId=' + res.data.targetId,
+            url: '/pages/im/private/call?targetId=' + res.data.targetId + '&mediaType=' +
+                res.data.mediaType,
             success: (err) => {
                 console.log('跳转视频通话成功');
             },
@@ -114,21 +115,6 @@ const addListeners = () => {
             }
         })
     })
-    CallLib.onCallOutgoing((res) => {
-        console.log("主叫端拨出电话后，通过回调 onCallOutgoing，通知当前 call 的详细信息", res)
-    })
-    CallLib.onCallConnected((res) => {
-        console.log("Engine:OnCallConnected=>" + "通话接通时，通过回调 onCallConnected 通知当前 call 的详细信息", res)
-    });
-    CallLib.onRemoteUserJoined((res) => {
-        console.log("Engine:OnRemoteUserJoined=>" + "主叫端拨出电话，被叫端收到请求后，加入通话，被叫端Id为=>", res.data.userId);
-    })
-    CallLib.onCallDisconnected((res) => {
-        console.log("Engine:OnCallDisconnected=>" + "挂断成功, 挂断原因=>", res.data.reason)
-    })
-    CallLib.onRemoteUserLeft((res) => {
-        console.log("Engine:OnRemoteUserLeft=>" + "远端用户挂断，远端Id为=>", res.data.reason)
-    })
 }
 
 // 维护消息列表
diff --git a/utils/im/视频呼入.json b/utils/im/视频呼入.json
new file mode 100644
index 0000000..97a4087
--- /dev/null
+++ b/utils/im/视频呼入.json
@@ -0,0 +1,51 @@
+{
+    "type": "Engine:OnCallReceived",
+    "module": "RongCloud-Call-RCUniCall",
+    "data": {
+        "endTime": 0,
+        "users": [{
+            "userId": "10051",
+            "enableCamera": false,
+            "mediaId": "420111350",
+            "mediaType": 1,
+            "userType": 0,
+            "enableMicrophone": false
+        }, {
+            "userId": "10047",
+            "enableCamera": false,
+            "mediaType": 1,
+            "userType": 0,
+            "enableMicrophone": false
+        }],
+        "inviter": {
+            "userId": "10051",
+            "enableCamera": false,
+            "mediaId": "420111350",
+            "mediaType": 1,
+            "userType": 0,
+            "enableMicrophone": false
+        },
+        "caller": {
+            "userId": "10051",
+            "enableCamera": false,
+            "mediaId": "420111350",
+            "mediaType": 1,
+            "userType": 0,
+            "enableMicrophone": false
+        },
+        "connectedTime": 0,
+        "extra": "",
+        "startTime": 0,
+        "mediaType": 1,
+        "callId": "c28cb9d8-6581-474c-bfa5-9872a4824b65",
+        "targetId": "10051",
+        "callType": 0,
+        "mine": {
+            "userId": "10047",
+            "enableCamera": false,
+            "mediaType": 1,
+            "userType": 0,
+            "enableMicrophone": false
+        }
+    }
+}
diff --git a/utils/im/语音呼入.json b/utils/im/语音呼入.json
new file mode 100644
index 0000000..3c24ca0
--- /dev/null
+++ b/utils/im/语音呼入.json
@@ -0,0 +1,51 @@
+{
+    "type": "Engine:OnCallReceived",
+    "module": "RongCloud-Call-RCUniCall",
+    "data": {
+        "endTime": 0,
+        "users": [{
+            "userId": "10051",
+            "enableCamera": false,
+            "mediaId": "420068630",
+            "mediaType": 0,
+            "userType": 0,
+            "enableMicrophone": false
+        }, {
+            "userId": "10047",
+            "enableCamera": true,
+            "mediaType": 0,
+            "userType": 0,
+            "enableMicrophone": false
+        }],
+        "inviter": {
+            "userId": "10051",
+            "enableCamera": false,
+            "mediaId": "420068630",
+            "mediaType": 0,
+            "userType": 0,
+            "enableMicrophone": false
+        },
+        "caller": {
+            "userId": "10051",
+            "enableCamera": false,
+            "mediaId": "420068630",
+            "mediaType": 0,
+            "userType": 0,
+            "enableMicrophone": false
+        },
+        "connectedTime": 0,
+        "extra": "",
+        "startTime": 0,
+        "mediaType": 0,
+        "callId": "1a1462b8-b63b-40a9-bf95-963e810ac49a",
+        "targetId": "10051",
+        "callType": 0,
+        "mine": {
+            "userId": "10047",
+            "enableCamera": true,
+            "mediaType": 0,
+            "userType": 0,
+            "enableMicrophone": false
+        }
+    }
+}