2
0
imndx 3 жил өмнө
parent
commit
54519d6231

+ 0 - 1
App.vue

@@ -7,7 +7,6 @@ export default {
     console.log("App Launch");
       plus.push.getClientInfoAsync((info) => {
           let cid = info["clientid"];
-          console.log('xxx cid', cid)
           if (cid){
               wfc.setDeviceToken(cid);
           }

+ 0 - 1
components/uni-list/uni-refresh.vue

@@ -27,7 +27,6 @@ export default {
     },
     computed: {
         isShow() {
-            console.log('xxxx', this.display, this.pulling)
             if (this.display === "show" || this.pulling === true) {
                 return true;
             }

+ 1 - 1
manifest.json

@@ -1,7 +1,7 @@
 {
     "name" : "uni-chat",
     "appid" : "__UNI__2077CCF",
-    "description" : "野火IM uniapp 插件",
+    "description" : "野火IM uniapp demo",
     "versionName" : "1.0.0",
     "versionCode" : 101,
     "transformPx" : false,

BIN
nativeplugins/wf-uni-wfc-uikit/android/emojilibrary-release.aar


BIN
nativeplugins/wf-uni-wfc-uikit/android/imagepicker-release.aar


BIN
nativeplugins/wf-uni-wfc-uikit/android/libwebrtc.aar


BIN
nativeplugins/wf-uni-wfc-uikit/android/pttclient.aar


BIN
nativeplugins/wf-uni-wfc-uikit/android/uikit-release.aar


BIN
nativeplugins/wf-uni-wfc-uikit/android/uni-uikit-module-release.aar


+ 21 - 1
nativeplugins/wf-uni-wfc-uikit/package.json

@@ -16,7 +16,27 @@
             "hooksClass": "cn.wildfirechat.uni.uikit.UIKitUniAppHookProxy",
             "integrateType": "aar",
             "dependencies": [
-                "androidx.lifecycle:lifecycle-extensions:2.2.0"
+                "androidx.lifecycle:lifecycle-extensions:2.2.0",
+                "com.jakewharton:butterknife:10.2.1",
+                "q.rorbin:badgeview:1.1.3",
+                "com.lqr.adapter:library:1.0.2",
+                "com.jaeger.statusbaruitl:library:1.3.5",
+                "androidx.appcompat:appcompat:1.3.0-alpha01",
+                "com.google.android.material:material:1.3.0-alpha01",
+                "cjt.library.wheel:camera:1.1.9",
+                "com.github.bumptech.glide:glide:4.9.0",
+                "com.github.chrisbanes:PhotoView:2.3.0",
+                "com.afollestad.material-dialogs:core:0.9.6.0",
+                "com.google.code.gson:gson:2.8.5",
+                "com.king.zxing:zxing-lite:1.1.1",
+                "com.github.wendux:DSBridge-Android:3.0.0",
+                "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+                "androidx.gridlayout:gridlayout:1.0.0",
+                "com.google.android:flexbox:2.0.1",
+                "com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.6",
+                "io.kvh:amr:1.1.1",
+                "com.squareup.okhttp3:okhttp:3.11.0",
+                "com.squareup.okio:okio:1.14.0"
             ],
             "abis": ["arm64-v8a", "armeabi-v7a", "x86"],
             "minSdkVersion": 21,

+ 1 - 2
pages/conversation/ConversationView.vue

@@ -614,7 +614,6 @@ export default {
         },
 
         onContextMenuItemSelect(t) {
-            console.log('xxx onContextMenuItemSelect', t)
             if (t.tag === 'delete') {
                 console.log('wfc delete message', t.message.messageId)
                 wfc.deleteMessage(t.message.messageId);
@@ -712,7 +711,7 @@ export default {
     flex-direction: column;
     /*background-color: #f3f3f3;*/
     /*padding: 0 12px;*/
-    padding-bottom: 112 rpx;
+    padding-bottom: 112rpx;
 }
 
 

+ 4 - 0
pages/conversation/message/content/ConferenceInviteMessageContentView.vue

@@ -37,6 +37,10 @@ export default {
                 wfcUIKit.joinConference(cmc.callId, cmc.audioOnly, cmc.pin, cmc.host, cmc.title, cmc.desc, cmc.audience, cmc.advanced, false, false)
             } else {
                 console.log('not support conference')
+                uni.showToast({
+                    title: '不支持会议功能',
+                    icon: 'none',
+                });
             }
         }
     },

+ 49 - 13
pages/login/login.vue

@@ -1,25 +1,23 @@
 <template>
     <view class="page-body">
         <view class="page-section">
-            <view class="weui-cells__title">请输入手机号</view>
-            <view class="weui-cells weui-cells_after-title">
-                <view class="weui-cell weui-cell_input">
+            <view>请输入手机号</view>
+            <view>
+                <view>
                     <input class="weui-input" @input="bindPhoneInput" type="number" placeholder="手机号"></input>
                 </view>
             </view>
         </view>
 
         <view class="page-section">
-            <view class="weui-cells__title">请输入验证码</view>
-            <view class="weui-cells weui-cells_after-title">
-                <view class="weui-cell weui-cell_input">
-                    <input class="weui-input" @input="bindCodeInput" type="number" placeholder="验证码"></input>
-                </view>
+            <view>请输入验证码</view>
+            <view class="auth-code-container">
+                <input @input="bindCodeInput" type="number" placeholder="验证码"></input>
+                <button :disabled="!phone" @tap="bindLoginTap">获取验证码</button>
             </view>
         </view>
 
-        <button @tap="bindLoginTap">登录</button>
-        <button @tap="bindAuthCodeTap">获取验证码</button>
+        <button :disabled="!(phone && code)" class="confirm-button" @tap="bindLoginTap">登录</button>
 
     </view>
 </template>
@@ -41,7 +39,7 @@ export default {
 
     components: {},
     props: {},
-    onLoad(){
+    onLoad() {
         let userId = getItem('userId');
         let token = getItem('token')
         if (token) {
@@ -131,7 +129,7 @@ export default {
             });
         },
 
-        go2ConversationList(){
+        go2ConversationList() {
             uni.switchTab({
                 url: '/pages/conversationList/ConversationListView',
                 success: () => {
@@ -150,5 +148,43 @@ export default {
 };
 </script>
 <style>
-@import "./login.css";
+.page-body {
+    padding: 20rpx;
+}
+
+.page-section {
+    margin-top: 20rpx;
+}
+
+.auth-code-container {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    height: 50px;
+    /*background-color: green;*/
+}
+
+.auth-code-container input {
+    flex: 1;
+    padding-right: 5px;
+}
+
+.auth-code-container button {
+    /*background-color: red;*/
+    font-size: 14px;
+}
+
+.confirm-button{
+    margin-top: 20px;
+}
+
+/*.other-button-hover {*/
+/*    background-color: #7497f1;*/
+/*}*/
+
+/*.button-hover {*/
+/*    background-color: #4168e0;*/
+/*}*/
 </style>