修复一些小问题

app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/meeting/invited/MeetingDetailInfoActivity.kt

@@ -53,7 +53,7 @@ class MeetingDetailInfoActivity : BaseMVPActivity<MeetingDetailInfoContract.View
         edit_meeting_invited_name.text = meetingDetailInfo.subject
         edit_meeting_invited_start_day.text = meetingDetailInfo.startTime.substring(0,10)
         edit_meeting_time.text = meetingDetailInfo.startTime.substring(11,16)+"-"+meetingDetailInfo.completedTime.substring(11,16)
-        meeting_people_sum.text =  "${(meetingDetailInfo.inviteMemberList.size+1)}人"
+        meeting_people_sum.text =  "${meetingDetailInfo.inviteMemberList.size}人"
         edit_meeting_type.text = meetingDetailInfo.type
         val hostPerson = if (!TextUtils.isEmpty(meetingDetailInfo.hostPerson) && meetingDetailInfo.hostPerson.contains("@")) {
             meetingDetailInfo.hostPerson.split("@")[0]

app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/scanlogin/ScanLoginActivity.kt

@@ -73,17 +73,15 @@ class ScanLoginActivity : BaseMVPActivity<ScanLoginContract.View, ScanLoginContr
     }
 
     private fun parseResult() {
-        if (StringUtil.isUrl(result)) {
-            parseMeta()
-            if (!TextUtils.isEmpty(meta)) {
-                title = getString(net.zoneland.x.bpm.mobile.v1.zoneXBPM.R.string.scan_login_confirm_title)
-                activity_scan_login.visible()
-                tv_scan_login_text_content.gone()
-            }else if (result.contains("x_meeting_assemble_control") && result.contains("/checkin")){
-                meetingCheckin(result)//会议签到
-            }else{
-                gotoDefaultBrowser()
-            }
+        parseMeta()
+        if (!TextUtils.isEmpty(meta)) {
+            title = getString(net.zoneland.x.bpm.mobile.v1.zoneXBPM.R.string.scan_login_confirm_title)
+            activity_scan_login.visible()
+            tv_scan_login_text_content.gone()
+        } else if (result.contains("x_meeting_assemble_control") && result.contains("/checkin")){
+            meetingCheckin(result)//会议签到
+        } else if (StringUtil.isUrl(result)) {
+            gotoDefaultBrowser()
         }else{
             activity_scan_login.gone()
             tv_scan_login_text_content.text = result

app/src/main/res/layout/activity_cloud_disk_v3.xml

@@ -76,15 +76,14 @@
 
         <TextView
             android:id="@+id/tv_org_file"
-            android:layout_toEndOf="@+id/image_org_file_id"
-            android:layout_alignTop="@+id/image_org_file_id"
-            android:layout_marginStart="@dimen/spacing_small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/font_large"
-            android:textColor="@color/z_color_text_primary_dark"
+            android:layout_alignTop="@+id/image_org_file_id"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_toEndOf="@+id/image_org_file_id"
             android:text="@string/cloud_file_org"
-            />
+            android:textColor="@color/z_color_text_primary_dark"
+            android:textSize="@dimen/font_large" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/layout/item_meeting_list_view.xml

@@ -19,9 +19,9 @@
         android:id="@+id/iv_meeting_list_item_deal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/pic_deal"
         android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"/>
+        android:layout_alignParentEnd="true"
+        android:src="@mipmap/pic_deal" />
 
     <TextView
         android:id="@+id/tv_meeting_list_item_title"

app/src/main/res/layout/item_meeting_room_view.xml

@@ -145,12 +145,12 @@
         android:id="@+id/tv_meeting_list_size"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/font_meeting_participants"
-        android:textColor="@color/z_color_text_primary"
-        tools:text="叶子"
         android:layout_alignTop="@+id/ll_meeting_room_device"
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/spacing_twenty"/>
+        android:layout_marginEnd="@dimen/spacing_twenty"
+        android:textColor="@color/z_color_text_primary"
+        android:textSize="@dimen/font_meeting_participants"
+        tools:text="叶子" />
 
     <ImageView
         android:id="@+id/image_meeting_list_item_icon"

app/src/main/res/values/strings.xml

@@ -259,7 +259,7 @@
     <string name="cloud_file_my_desc">个人文件</string>
 
     <string name="cloud_file_org">企业文件</string>
-    <string name="cloud_file_org_desc">内部共享区</string>
+    <string name="cloud_file_org_desc">共享工作区</string>
 
     <string name="cloud_file_my_favorite">我的收藏</string>
     <string name="cloud_file_my_zone">共享工作区</string>

gradle.properties

@@ -23,16 +23,18 @@ android.enableJetifier=true
 
 
 # o2
-o2.versionName=6.4.10
-o2.versionCode=200
+o2.versionName=6.4.11
+o2.versionCode=201
 
 
 # 第三方
 JPUSH_APPKEY=9aca7cc20fe0cc987cd913ca
+BAIDU_MAP_APPKEY=l2yttjuKSSmggOKRY8nbWuDro7dX4gqq
+
+#
 BAIDU_SPEECH_APPKEY=l2yttjuKSSmggOKRY8nbWuDro7dX4gqq
 BAIDU_SPEECH_APPID=9180689
 BAIDU_SPEECH_SECRET=gkAZkZ605YIDFoHuPsfvFROsorjDe36H
-BAIDU_MAP_APPKEY=l2yttjuKSSmggOKRY8nbWuDro7dX4gqq
 BUGLY_APPID=71c852531c
 
 # appid appkey 前面加MI- 极光集成需要