From 5bc73473d996c692350020d2d395a2dbc44a3e5c Mon Sep 17 00:00:00 2001
From: hanhu <hanhu@hecom.cn>
Date: Thu, 7 Jan 2021 17:37:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=A4=E8=81=8A?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20-=20=E5=85=A8=E9=83=A8=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BAUI=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=9C=AA=E8=AF=BB=E6=A0=87=E8=AE=B0=E7=AB=96?=
 =?UTF-8?q?=E7=9B=B4=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 language/zh.json                         |   5 +-
 plugin/message/display/VideoBubble.tsx   |  70 +++++--
 plugin/setting/AllMembers.tsx            |  89 ++++++++-
 plugin/setting/AvatarList.tsx            |   1 +
 plugin/setting/GroupData.tsx             |  63 +++++++
 plugin/setting/GroupName.tsx             |  25 ++-
 plugin/setting/index.ts                  |   7 +-
 standard/component/AvatarList.tsx        |   5 +-
 standard/component/MessageBubble.tsx     |   1 +
 standard/component/image/showMore@3x.png | Bin 0 -> 1974 bytes
 standard/index.ts                        |   1 +
 standard/model/external.ts               |   3 +-
 standard/model/group.ts                  |   4 +
 standard/page/ChatDetail.tsx             |  36 ++--
 standard/page/ChatSetting.tsx            |   7 -
 standard/page/GroupNameEdit.tsx          | 223 +++++++++++++++++++++++
 standard/page/image/showMore@3x.png      | Bin 0 -> 1974 bytes
 standard/page/index.ts                   |   2 +
 standard/pagekey.ts                      |   1 +
 standard/typings/Component.ts            |   2 +
 standard/typings/Delegate.ts             |   5 +-
 standard/typings/Message.ts              |   2 +-
 22 files changed, 500 insertions(+), 52 deletions(-)
 create mode 100644 plugin/setting/GroupData.tsx
 create mode 100644 standard/component/image/showMore@3x.png
 create mode 100644 standard/page/GroupNameEdit.tsx
 create mode 100644 standard/page/image/showMore@3x.png

diff --git a/language/zh.json b/language/zh.json
index a6ead73..b951b05 100644
--- a/language/zh.json
+++ b/language/zh.json
@@ -25,7 +25,7 @@
     "IMPageChooseUserSelectFromOrg": "按部门选同事",
     "IMPageChooseUserAll": "所有人",
     "IMSettingAddGroupMember": "添加群成员",
-    "IMSettingAllMembers": "全体成员({{length}})",
+    "IMSettingAllMembers": "查看全体群成员({{length}})",
     "IMSettingAllowInvite": "允许添加成员",
     "IMSettingAvoid": "消息免打扰",
     "IMSettingChooseGroupMember": "选择群成员",
@@ -47,5 +47,6 @@
     "IMSettingTransferOwnerAction": "转交",
     "IMToastError": "{{action}}失败",
     "IMToastMessageNotSupport": "当前版本暂不支持该消息",
-    "IMToastSuccess": "{{action}}成功"
+    "IMToastSuccess": "{{action}}成功",
+    "IMSettingGroupDataInfo": "资料"
 }
diff --git a/plugin/message/display/VideoBubble.tsx b/plugin/message/display/VideoBubble.tsx
index 50c0a8d..9c1bb3b 100644
--- a/plugin/message/display/VideoBubble.tsx
+++ b/plugin/message/display/VideoBubble.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import {Platform, Text, ActivityIndicator, Image, StyleSheet, View} from "react-native";
-
+import {ActivityIndicator, Image, Platform, StyleSheet, Text, View} from "react-native";
 import Video from 'react-native-video';
 import {Typings} from '../../../standard';
 import OSSManager from 'core/oss/OSSManager';
@@ -15,6 +14,12 @@ export type Props = Typings.Action.Display.Params<Typings.Message.VideoBody>;
 export interface State {
     paused: boolean;
     downloadReady: boolean;
+    displaySize?: Size;
+}
+
+class Size {
+    width: number;
+    height: number;
 }
 
 export default class extends React.PureComponent<Props, State> {
@@ -26,16 +31,18 @@ export default class extends React.PureComponent<Props, State> {
     };
     private remotePath: string;
     private localPath: string;
-    private maxWidth: number;
     private playableDuration: any;
     private displayPath: string;
+    private maxDisplaySize: number;
+    private size: Size;
 
     constructor(props: Props) {
         super(props);
-        const {message: {data: {localPath, remotePath, playableDuration}}, maxWidth} = props;
+        const {message: {data: {localPath, remotePath, playableDuration, size}}, maxWidth} = props;
         this.remotePath = remotePath;
         this.localPath = localPath;
-        this.maxWidth = maxWidth;
+        this.maxDisplaySize = maxWidth * 0.6;
+        this.size = size;
         this.playableDuration = playableDuration;
     }
 
@@ -49,13 +56,11 @@ export default class extends React.PureComponent<Props, State> {
     }
 
     _renderContent() {
-        const width = this.maxWidth;
-        const height = this.maxWidth * 0.75;
         let content;
         if (this.isAndroid) {
             content = (
                 <Image
-                    style={[styles.video, {width, height}]}
+                    style={[styles.video, {...this.state.displaySize}]}
                     resizeMode='cover'
                     source={{uri: this.displayPath}}
                 />
@@ -65,7 +70,7 @@ export default class extends React.PureComponent<Props, State> {
                 <Video
                     source={{uri: this.displayPath}}
                     ref={(ref: Video | null) => this.player = ref}
-                    style={[styles.video, {width, height}]}
+                    style={[styles.video, {...this.state.displaySize}]}
                     paused={this.state.paused}
                     resizeMode="cover"
                     onFullscreenPlayerWillPresent={this._fullScreenPlayerWillPresent.bind(this)}
@@ -77,7 +82,7 @@ export default class extends React.PureComponent<Props, State> {
             <View style={{justifyContent: 'flex-end'}}>
                 {content}
                 <Image
-                    style={[styles.image, {width, height}]}
+                    style={[styles.image, {...this.state.displaySize}]}
                     resizeMode='center'
                     source={require('./image/video_play.png')}
                 />
@@ -95,6 +100,36 @@ export default class extends React.PureComponent<Props, State> {
         );
     }
 
+    async _determinSize(size: Size, localPath: string): Promise<Size> {
+        localPath = this._trimPrefix(localPath);
+        if (Platform.OS === 'ios') {
+            localPath = localPath.replace(RNFS.TemporaryDirectoryPath, 'tmp/');
+        }
+        const result = new Size();
+        const radio = size.height / size.width;
+        if (IMStandard.Delegate.func.getVideoMetaData === undefined) {
+            result.width = this.maxDisplaySize;
+            result.height = result.width * radio;
+            return result;
+        }
+        let rotation = 90;
+        try {
+            const metaData = await IMStandard.Delegate.func.getVideoMetaData(localPath);
+            rotation = metaData.rotation;
+        } catch (e) {
+            console.log(`get ${localPath} rotation failed!`);
+        }
+        //land or portrait
+        if (rotation == 0 || rotation == 180) {
+            result.width = this.maxDisplaySize;
+            result.height = result.width * radio;
+        } else {
+            result.height = this.maxDisplaySize;
+            result.width = result.height * radio;
+        }
+
+        return result;
+    }
 
     _convertDuration(playableDuration: number) {
         const prefixWithZero = (time: number) => {
@@ -143,7 +178,10 @@ export default class extends React.PureComponent<Props, State> {
         const checkTask = async () => {
             if (this.localPath != null && await RNFS.exists(this._trimPrefix(this.localPath))) {
                 this.displayPath = this._filePrefix(this.localPath);
-                this.setState({downloadReady: true});
+                this._determinSize(this.size, this.displayPath).then(size => {
+                    this.setState({downloadReady: true, displaySize: size,});
+                });
+
             } else {
                 if (this.remotePath == null) {
                     return;
@@ -151,7 +189,9 @@ export default class extends React.PureComponent<Props, State> {
                 const exist = await RNFS.exists(this._generateLocalPath(this.remotePath));
                 if (exist) {
                     this.displayPath = this._filePrefix(this._generateLocalPath(this.remotePath));
-                    this.setState({downloadReady: true});
+                    this._determinSize(this.size, this.displayPath).then(size => {
+                        this.setState({downloadReady: true, displaySize: size,});
+                    });
                 } else {
                     this._downLoad();
                 }
@@ -164,11 +204,13 @@ export default class extends React.PureComponent<Props, State> {
         const path = await OSSManager.downloadFile(this.remotePath, this._generateLocalPath(this.remotePath), (percent) => {
         });
         this.displayPath = this._filePrefix(path);
-        this.setState({downloadReady: true});
+        this._determinSize(this.size, this.displayPath).then(size => {
+            this.setState({downloadReady: true, displaySize: size,});
+        });
     }
 
     _generateLocalPath(path: string) {
-        if (isAndroid) {
+        if (this.isAndroid) {
             return `${RNFS.ExternalCachesDirectoryPath}/${md5(path)}.${path.split('.').pop()}`;
         } else {
             return `${RNFS.TemporaryDirectoryPath}/${md5(path)}.${path.split('.').pop()}`;
diff --git a/plugin/setting/AllMembers.tsx b/plugin/setting/AllMembers.tsx
index 7719bab..601f596 100644
--- a/plugin/setting/AllMembers.tsx
+++ b/plugin/setting/AllMembers.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import i18n from 'i18n-js';
 import { Typings, Delegate, PageKeys } from '../../standard';
 import { onAddMembers, onRemoveMembers } from './GeneralUpdate';
-import { Dimensions } from 'react-native';
+import { Dimensions, TouchableHighlight, StyleSheet, View, Text} from 'react-native';
 import { getSafeAreaInset } from '@hecom/react-native-pure-navigation-bar';
 
 export const name = 'IMSettingAllMembers';
@@ -17,10 +17,10 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
     if (groupMembers.length <= showMaxColumn(props)) {
         return null;
     }
+
     return (
-        <Delegate.component.SettingItem
+        <AllMembersCell
             key={key}
-            type={Typings.Component.SettingItemType.Text}
             title={i18n.t('IMSettingAllMembers', {length: groupMembers.length})}
             onPressLine={() => _clickAllMembers(props)}
         />
@@ -43,7 +43,7 @@ function showMaxColumn(props: Typings.Action.Setting.Params): number {
     }
     let canAdd = true;
     let canRemove = groupOwner === Delegate.user.getMine().userId;
-    const maxRow = 6;
+    const maxRow = 3;
     const showCount = column * maxRow - (canAdd ? 1 : 0) - (canRemove ? 1 : 0);
     return showCount;
 }
@@ -61,4 +61,83 @@ function _clickAllMembers(props: Typings.Action.Setting.Params): void {
             onAddMembers: (memberUserIds: string[]) => onAddMembers(props, memberUserIds),
             onRemoveMembers: (memberUserIds: string[]) => onRemoveMembers(props, memberUserIds),
         });
-}
\ No newline at end of file
+}
+
+export interface Props {
+    title: string;
+    onPressLine?: () => void;
+}
+
+export interface State {
+    allowInvites: boolean;
+}
+
+export class AllMembersCell extends React.PureComponent<Props> {
+    constructor(props: Props) {
+        super(props);
+    }
+
+    render() {
+        const {onPressLine} = this.props;
+        return onPressLine ? (
+            <TouchableHighlight
+                underlayColor={Delegate.style.separatorLineColor}
+                onPress={onPressLine}
+            >
+                {this._renderLine()}
+            </TouchableHighlight>
+        ) : this._renderLine();
+    }
+
+    protected _renderLine() {
+        const {title} = this.props;
+        return (
+            <View style={styles.container}>
+                {/* <View style={styles.line}>
+                    
+                </View> */}
+                {this._renderLabel(title)}
+            </View>
+        );
+    }
+
+    protected _renderLabel(title: string) {
+        return (
+            <View style={styles.titleview}>
+                <Text numberOfLines={1} style={styles.title}>
+                    {title}
+                </Text>
+            </View>
+        );
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        flexDirection: 'row',
+        backgroundColor: 'white',
+
+    },
+    line: {
+        height: 48,
+        flex: 1,
+        alignItems: 'center',
+        flexDirection: 'row',
+        backgroundColor: 'white',
+        justifyContent: 'center',
+        paddingHorizontal: 16,
+    },
+
+    titleview: {
+        height: 48,
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+    },
+    title: {
+        fontSize: 16,
+        color: '#333333',
+        textAlign:'center',
+    },
+});
\ No newline at end of file
diff --git a/plugin/setting/AvatarList.tsx b/plugin/setting/AvatarList.tsx
index 0104b67..cd53329 100644
--- a/plugin/setting/AvatarList.tsx
+++ b/plugin/setting/AvatarList.tsx
@@ -21,6 +21,7 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
             canAdd={isOwner || allowAdd}
             canRemove={isOwner}
             navigation={navigation}
+            tempProps={props}
         />
     );
 }
\ No newline at end of file
diff --git a/plugin/setting/GroupData.tsx b/plugin/setting/GroupData.tsx
new file mode 100644
index 0000000..101059c
--- /dev/null
+++ b/plugin/setting/GroupData.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { View } from 'react-native';
+import Toast from 'react-native-root-toast';
+import i18n from 'i18n-js';
+import { Typings, Delegate } from '../../standard';
+
+export const name = 'IMSettingGroupDataInfo';
+
+export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Setting.Result {
+    const {key, imId, chatType} = props;
+    const isGroup = chatType === Typings.Conversation.ChatType.Group;
+    if (!isGroup) {
+        return null;
+    }
+    const groupName = Delegate.model.Group.getName(imId, false);
+    const groupOwner = Delegate.model.Group.getOwner(imId);
+    const isOwner = groupOwner === Delegate.user.getMine().userId;
+    return (
+        <GroupDataInfoCell
+            key={key}
+            isOwner={isOwner}
+            groupName={groupName}
+            imId={imId}
+        />
+    );
+}
+
+export interface Props {
+    isOwner: boolean;
+    groupName: string | void;
+    imId: string;
+}
+
+export interface State {
+}
+
+export class GroupDataInfoCell extends React.PureComponent<Props,State> {
+    state: State = {
+    };
+
+    render() {
+        return (
+            <View>
+                <Delegate.component.SettingItem
+                    type={Typings.Component.SettingItemType.Text}
+                    title={i18n.t('IMSettingGroupDataInfo')}
+                    data={""}
+                    onPressLine={this._clickLine.bind(this)}
+                />
+            </View>
+        );
+    }
+    
+    protected _clickLine() {
+        const {imId} = this.props;
+        Delegate.model.Group.showGroupDataRecord(imId)
+            .catch(() => {
+                Toast.show(i18n.t('IMToastError', {
+                    action: i18n.t('IMSettingGroupDataInfo'),
+                }));
+            });
+    }
+}
\ No newline at end of file
diff --git a/plugin/setting/GroupName.tsx b/plugin/setting/GroupName.tsx
index 0902bec..f736ee8 100644
--- a/plugin/setting/GroupName.tsx
+++ b/plugin/setting/GroupName.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 import { View } from 'react-native';
 import Toast from 'react-native-root-toast';
 import i18n from 'i18n-js';
-import { Typings, Delegate } from '../../standard';
+import { Typings, Delegate, PageKeys } from '../../standard';
 import Prompt from './Prompt';
 
 export const name = 'IMSettingGroupName';
 
 export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Setting.Result {
-    const {key, imId, chatType, onDataChange} = props;
+    const {key, imId, chatType, onDataChange,navigation} = props;
     const isGroup = chatType === Typings.Conversation.ChatType.Group;
     if (!isGroup) {
         return null;
@@ -25,6 +25,7 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
             isOwner={isOwner}
             groupName={groupName}
             imId={imId}
+            navigation={navigation}
             onDataChange={onDataChange}
         />
     );
@@ -48,7 +49,7 @@ export class GroupNameCell extends React.PureComponent<Props, State> {
 
     render() {
         const {groupName, isOwner} = this.props;
-        const showNameLineFunc = !isOwner ? undefined : this._changePromptStatus.bind(this, true);
+        const showNameLineFunc = !isOwner ? undefined : this._clickNameEdit.bind(this);
         return (
             <View>
                 <Delegate.component.SettingItem
@@ -57,13 +58,13 @@ export class GroupNameCell extends React.PureComponent<Props, State> {
                     data={groupName}
                     onPressLine={showNameLineFunc}
                 />
-                <Prompt
+                {/* <Prompt
                     visible={this.state.showPrompt}
                     title={i18n.t('IMSettingGroupNameChangeTips')}
                     onCancel={this._changePromptStatus.bind(this, false)}
                     onSubmit={this._clickName.bind(this)}
                     textInputProps={{secureTextEntry: false}}
-                />
+                /> */}
             </View>
         );
     }
@@ -89,4 +90,18 @@ export class GroupNameCell extends React.PureComponent<Props, State> {
                 }));
             });
     }
+
+    protected _clickNameEdit() {
+        const {imId, onDataChange, groupName, navigation, onSendMessage} = this.props;
+        const curGroupName = (groupName != null) ? groupName : ''
+        const groupAvatar = { imId: imId, chatType:Typings.Conversation.ChatType.Group };
+
+        navigation.navigate( PageKeys.GroupNameEdit, {
+            groupId: imId,
+            groupName: curGroupName,
+            groupAvatar: groupAvatar,
+            onDataChange: onDataChange,
+            onSendMessage: onSendMessage,
+        })
+    }
 }
\ No newline at end of file
diff --git a/plugin/setting/index.ts b/plugin/setting/index.ts
index d92d5d7..b48b8c7 100644
--- a/plugin/setting/index.ts
+++ b/plugin/setting/index.ts
@@ -7,6 +7,7 @@ import * as GroupAvatar from './GroupAvatar';
 import * as GroupMemberName from './GroupMemberName';
 import * as GroupName from './GroupName';
 import * as GroupAnnouncement from './GroupAnnouncement';
+import * as GroupData from './GroupData';
 import * as LeaveGroup from './LeaveGroup';
 import * as Top from './Top';
 import * as TransferOwner from './TransferOwner';
@@ -19,10 +20,10 @@ export function setup() {
         (props: Typings.Action.Setting.Params) => Typings.Action.Setting.Result
     ];
     const actions: ActionItem[] = [
-        [AllMembers.name, AllMembers.getUi],
         [AllowInvite.name, AllowInvite.getUi],
         [AvatarList.name, AvatarList.getUi],
         [Avoid.name, Avoid.getUi],
+        [GroupData.name,GroupData.getUi],
         [GroupAvatar.name, GroupAvatar.getUi],
         [GroupMemberName.name, GroupMemberName.getUi],
         [GroupName.name, GroupName.getUi],
@@ -35,7 +36,8 @@ export function setup() {
         Model.Setting.registerDefault(name, getUi);
     });
     Delegate.page[PageKeys.ChatSetting].defaultProps.sections = [
-        [AvatarList.name, AllMembers.name],
+        [AvatarList.name],
+        [GroupData.name],
         [GroupName.name, GroupAvatar.name, GroupAnnouncement.name, AllowInvite.name, Top.name, Avoid.name, GroupMemberName.name]
     ];
     Delegate.page[PageKeys.ChatSetting].defaultProps.buttons = [
@@ -49,6 +51,7 @@ export {
     AllowInvite,
     AvatarList,
     Avoid,
+    GroupData,
     GroupAvatar,
     GroupName,
     GroupAnnouncement,
diff --git a/standard/component/AvatarList.tsx b/standard/component/AvatarList.tsx
index b51b73d..0a379f9 100644
--- a/standard/component/AvatarList.tsx
+++ b/standard/component/AvatarList.tsx
@@ -5,6 +5,7 @@ import i18n from 'i18n-js';
 import { Component } from '../typings';
 import * as PageKeys from '../pagekey';
 import delegate from '../delegate';
+import { AllMembers } from 'react-native-im/plugin/setting';
 
 export type Props = Component.AvatarListProps;
 
@@ -30,9 +31,11 @@ export default class extends React.PureComponent<Props> {
 
     render() {
         const dataSource = this._getDataSource();
+        const {tempProps} = this.props;
         return (
             <View>
                 {dataSource.map(this._renderRow.bind(this))}
+                {AllMembers.getUi(tempProps)}
             </View>
         );
     }
@@ -104,7 +107,7 @@ export default class extends React.PureComponent<Props> {
 
     protected _getDataSource(): string[][] {
         const column = this._calculateColumn();
-        const maxRow = 6;
+        const maxRow = 3;
         const {canAdd, canRemove, data} = this.props;
         const showCount = column * maxRow - (canAdd ? 1 : 0) - (canRemove ? 1 : 0);
         const newData = [...data.slice(0, showCount)];
diff --git a/standard/component/MessageBubble.tsx b/standard/component/MessageBubble.tsx
index ebc179a..3149d9a 100644
--- a/standard/component/MessageBubble.tsx
+++ b/standard/component/MessageBubble.tsx
@@ -71,6 +71,7 @@ export default class extends React.PureComponent<Props, State> {
                     height: 5,
                     borderRadius: 10,
                     marginLeft: 5,
+                    alignSelf: 'center',
                 }}/>
             )
         } else {
diff --git a/standard/component/image/showMore@3x.png b/standard/component/image/showMore@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1ebe97f06529e8fb6192e12f01f1516d0c17f6d
GIT binary patch
literal 1974
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k8A#4*i(3PvSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZk1_mb8
z0G|+7pn_2_8Upx3AfZg152#{WNswPKgJSyJBiHX<+}`8I!)#Z-=Jf3oE6Pn7g~BKA
zzI=86%s5H!e_!Uv*FDW;(^>uVkEO|h9|Bn~?nuvDr<(Rli+AG^4y(_BOjAC%9~O@P
zThZ~|jE~(TBj(xG`I?Th-%6tdgWho^PB`C{|44kg#rtbzZ~Fc9Hk>iMG^sG@&_b1F
zwI^;VS3-+RS~ZTP9(A6^@<}Yjm^-0HCi?XZW!777MUB4tI*6QGs{P=?W><;5FHeT8
ze>HL6y<Ku=&-NKE0s4S3$=lt9p@UV{1IXbl@Q5r1(jc}6gWJh$I|c^kEKe85kcwMx
zZ(NNI2^2Z@aB*Kkf<jVX>)M_!J~1|}g?){Ut%hP{<;mNddhg!d_}@-mpC|2HT>4wb
z`NzBOSO2fAe%mR0`!mo;tl-1`j0+nAR}@B7O<s0(*7fCTi(OBLt-Wk?J7w$Hyzu$+
zzR6mZy_zHT?$Xxi^5rr80ewGLrmw%ZQt$pA|NHT#YMbN#hg7riocS9noN44SSK8*t
zm5J9&GPF*o^K@T(d-DB+OJ;5T9ar8;T6&4g#3l$m?Jtb4f3stWl<~d`d()jvR;E2t
zab36K#t#k6(%AiuH`b?r61hHaWu=|z#>|5UUmm;OGc)h?^wz)CPMhykrMds9e#XN3
zT&nxiL%rAOXEuL5Q-14slaROXK_|-{D-M}8ynJGGASt^y^3kWtl5N*qrgxqE`Hk_6
z(O(Ad$KPgsdirag=phU3r4Jf9Cd4e=zjUowme0~%%L;k}f;WbFteebc@cJrq&V($p
zRpy&qWYQ<wMr?`n$-Bt6A#{!5?Jc&qkIs_)_Q0>QA@&wy*=gJADW;N-#IuvWRbPs$
zZ0PtVx55A2&Gl<66|PJC7X6Xn@M%I()8QgtV3evP%vlvuFQgW2dC+C&vlW}3MI5j=
zzV>7vqvzXXuLEv}>NAzq*PNWpcry4D=c%W&E}xopsiE*(#N^N-gRm8I9;~@z92Z%v
zk)Zs1&B+|g75gU7on9@bovjxml3k=1Ihj%XUD8`Oz0=YwuYEfsoPDV^McMGCleI(d
zkHBZE=igk{@i<0w(p5{Rg2n$92JZQ@HT3!wm)2Q#vV%;#J>tUoAH)jnn<Sn3YhL0Z
z3-hB-*2ZKTJSj4`dfd)os<ZFg-0ZV+cWc(M&Ca*vd2p3)<JT=kRx5Uw-wzV577*DQ
zW5q4EYt8%0{!4$V<*x7e8nf+BcC-G&t^R+CM33LO_I=Ot^M9)5S<5E=33&PY(yl1c
zUe%|+tmN4K8Z7nx^h^KLoocVi`FWM$B^Rg9<UF`0{N3y7xc|+Z>Dj7(gRD--eYHxQ
zBYXAMi!~SPW!8)4gzsOi{wg-+)9&YIPr9%CcBby{@%|@ocPmYQb1w7!Vfjbx_xom4
zU00p9V#Cej{_`JyydA%6|DJ&P^VS#7tI_Uvzsw$%75@%vCIAY4cwfu@AhbiW=j@07
zK(1<uYeY#(Vo9o1a#1RfVlXl=GSD?N(ls&;F*LC<G_W$T)HblNGBD6t@0Nq2AvZrI
zGp!Q0hS*R4E&w&SgKQ`+OSei&EKb!eEy`p_%gjl&(%09|$j?pHPfW?p%+t?I&d<|L
x%g-y(FUc(c^WqcDa?34^E7KEm()3f!%nkK`X1vvoR0JBy;OXk;vd$@?2>@A`cM|{r

literal 0
HcmV?d00001

diff --git a/standard/index.ts b/standard/index.ts
index f3b592a..5400146 100644
--- a/standard/index.ts
+++ b/standard/index.ts
@@ -21,6 +21,7 @@ function setup_common_page() {
     Delegate.page[PageKeys.GroupAnnouncementEdit] = Pages.GroupAnnouncementEditPage;
     Delegate.page[PageKeys.Search] = Pages.SearchPage;
     Delegate.page[PageKeys.SearchMore] = Components.SearchList;
+    Delegate.page[PageKeys.GroupNameEdit] = Pages.GroupNameEdit;
 }
 
 function setup_common_render() {
diff --git a/standard/model/external.ts b/standard/model/external.ts
index b65d8de..d16b906 100644
--- a/standard/model/external.ts
+++ b/standard/model/external.ts
@@ -12,11 +12,12 @@ export async function onMessageReceived(
     originMessage: Message.Origin
 ): Promise<ProcessedMessage> {
     //语音消息插入未读标志
+    //语音消息插入未点击标志
     const {ext} = originMessage;
     if (ext &&
         ext.extend_message_body &&
         ext.extend_message_body.messageType &&
-        ext.extend_message_body.messageType.messageType == 5) {
+        ext.extend_message_body.messageType == 5) {
         originMessage.ext.shouldRead = true;
         delegate.im.conversation.updateMessageExt(originMessage.messageId, originMessage.ext);
     }
diff --git a/standard/model/group.ts b/standard/model/group.ts
index bf94436..b1ca546 100644
--- a/standard/model/group.ts
+++ b/standard/model/group.ts
@@ -157,6 +157,10 @@ export async function changeName(groupId: string, newName: string): Promise<stri
     return changeGroupInfo(groupId, {name: newName}, newName);
 }
 
+export async function showGroupDataRecord(imId:string) {
+    await delegate.im.group.showGroupDataRecord(imId)
+}
+
 export async function changeAnnouncement(groupId: string, newAnnouncement: string): Promise<string> {
     await delegate.im.group.changeAnnouncement(groupId, newAnnouncement);
     return changeGroupInfo(groupId, {announcement: newAnnouncement}, newAnnouncement);
diff --git a/standard/page/ChatDetail.tsx b/standard/page/ChatDetail.tsx
index a564f75..ae39930 100644
--- a/standard/page/ChatDetail.tsx
+++ b/standard/page/ChatDetail.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Clipboard, Keyboard, SafeAreaView, StyleSheet, TouchableWithoutFeedback, View, Alert} from 'react-native';
+import {Clipboard, Keyboard, SafeAreaView, StyleSheet, TouchableWithoutFeedback,Image, View, Alert,Text,TouchableOpacity} from 'react-native';
 import {HeaderButton} from 'react-navigation-header-buttons';
 import Toast from 'react-native-root-toast';
 import Listener from '@hecom/listener';
@@ -169,18 +169,23 @@ export default class extends React.PureComponent<ChatDetailProps> {
     _renderRightElement() {
         const {imId, chatType} = this.props;
         const onSendMsg = this._onSendMessage.bind(this, imId, chatType)
-        return (
-            <HeaderButton
-                title={i18n.t('IMPageChatDetailSetting')}
-                onPress={() => {
-                    this.props.navigation.navigate( PageKeys.ChatSetting,{
-                        imId: imId,
-                        chatType: chatType,
-                        onSendMessage: onSendMsg,
-                    });
-                }}
-            />
-        );
+        const moreImage = require('./image/showMore.png');
+        return (<TouchableOpacity
+            onPress={() => {
+                this.props.navigation.navigate( PageKeys.ChatSetting,{
+                    imId: imId,
+                    chatType: chatType,
+                    onSendMessage: onSendMsg,
+                });
+            }}
+            activeOpacity={0.8}
+        >
+            <Image
+                    source={moreImage}
+                    style={styles.rightImage}
+                />
+        </TouchableOpacity>
+    )
     }
 
     _setKeyboardStatus(status) {
@@ -418,4 +423,9 @@ const styles = StyleSheet.create({
     container: {
         flex: 1,
     },
+    rightImage: {
+        width: 24,
+        height: 24,
+        right: 10,
+    },
 });
diff --git a/standard/page/ChatSetting.tsx b/standard/page/ChatSetting.tsx
index b616230..0868374 100644
--- a/standard/page/ChatSetting.tsx
+++ b/standard/page/ChatSetting.tsx
@@ -14,13 +14,6 @@ export default class extends React.PureComponent {
         return {title};
     };
 
-    // static propTypes = {
-    //     ...Types.BasicConversation,
-    //     ...Types.Navigation,
-    //     sections: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
-    //     buttons: PropTypes.arrayOf(PropTypes.string),
-    // };
-
     static defaultProps = {
         sections: [],
         buttons: [],
diff --git a/standard/page/GroupNameEdit.tsx b/standard/page/GroupNameEdit.tsx
new file mode 100644
index 0000000..2c219e7
--- /dev/null
+++ b/standard/page/GroupNameEdit.tsx
@@ -0,0 +1,223 @@
+import React from 'react';
+import {Keyboard, Platform, Image ,StyleSheet, Text, TextInput, Dimensions, View} from 'react-native';
+import PropTypes from 'prop-types';
+import NaviBar, {getSafeAreaInset} from '@hecom/react-native-pure-navigation-bar';
+import {Delegate} from "react-native-im/standard/index";
+import Toast from "react-native-root-toast";
+import i18n from 'i18n-js';
+import Navigation from "@hecom/navigation/src/index";
+import delegate from "react-native-im/standard/delegate";
+
+const { width, height } = Dimensions.get('window');
+
+export default class extends React.PureComponent {
+    private keyboardDidShowListener: any;
+    private keyboardDidHideListener: any;
+    private isDisable = true
+
+    static propTypes = {
+        groupId: PropTypes.string.isRequired,
+        groupName: PropTypes.string.isRequired,
+        onDataChange: PropTypes.func.isRequired,
+    };
+
+    state = {
+        keyBoardHeight: 0,
+    }
+
+    componentWillMount() {
+        if (Platform.OS === 'ios') {
+            this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow.bind(this));
+            this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide.bind(this));
+        }
+    }
+    componentWillUnmount() {
+        if (Platform.OS === 'ios') {
+            this.keyboardDidShowListener.remove();
+            this.keyboardDidHideListener.remove();
+        }
+    }
+    protected _keyboardDidShow(e) {
+        if (Platform.OS === 'ios') {
+            this.setState({
+                keyBoardHeight: e.endCoordinates.height
+            });
+        }
+    }
+    protected _keyboardDidHide() {
+        if (Platform.OS === 'ios') {
+            this.setState({
+                keyBoardHeight: 0
+            });
+        }
+    }
+
+    render() {
+        const { groupName } = this.props;
+        // const rights = {};
+        // rights.rightElement = '保存';
+        //     if (this.isDisable) {
+        //         rights.rightElementDisable = true;
+        //     } else {
+        //         rights.onRight = this._onRight;
+        //     }
+        const safeArea = getSafeAreaInset();
+        const marginStyle = {marginBottom: Math.max(this.state.keyBoardHeight, 10) + safeArea.bottom};
+        return (
+            <View style={styles.container}>
+                <NaviBar title={''} autoCloseKeyboard={true} hasSeperatorLine={false}/>
+                <Text style={styles.titleText}>{'修改群聊名称'}</Text>
+                <View style={styles.topLineView} />
+                <View style={styles.backView}>
+                    {this._renderIcon()}
+                    <TextInput
+                        style={styles.input}
+                        defaultValue={groupName}
+                        maxLength={2000}
+                        multiline={false}
+                        clearButtonMode={'while-editing'}
+                        placeholder='请输入群名'
+                        onChangeText={(text) => {
+                            this.isDisable = false
+                            this.setState({text})
+                        }}
+                        autoFocus={true}
+                    />
+                </View>
+                <View style={styles.bottomLineView} />
+                <View style={[styles.buttonView,marginStyle]}>
+                        <Text style={styles.button} onPress={() => {
+                            if (!this.isDisable) {
+                                this._onRight()
+                            } else {
+                                Navigation.pop();
+                            }
+                        }}>
+                            {'完成'}
+                        </Text>
+                    </View>
+            </View>
+        );
+    }
+
+    protected _onRight = () => {
+        // const {groupId, onDataChange} = this.props;
+        let newName = this.state.text;
+        if (!newName) {
+            newName = ''
+        }
+        this.props.apiRefresh(true);
+    
+            if (!newName || newName.length === 0) {
+                Toast.show(i18n.t('IMSettingGroupNameNotEmpty'));
+                return;
+            }
+            const {groupId, onDataChange} = this.props;
+            Delegate.model.Group.changeName(groupId, newName)
+                .then(() => {
+                    this.props.apiRefresh(false);
+                    onDataChange();
+                    Toast.show('保存成功');
+                    Navigation.pop();
+                })
+                .catch(() => {
+                    this.props.apiRefresh(false);
+                    Toast.show(i18n.t('IMToastError', {
+                        action: i18n.t('IMSettingGroupNameChange'),
+                    }));
+                });
+    };
+
+    _renderIcon = () => {
+        const {groupAvatar} = this.props;
+        const isAvatar = Object.prototype.isPrototypeOf(groupAvatar) && groupAvatar.imId;
+        if (isAvatar) {
+            return (
+                <Delegate.component.AvatarImage
+                    {...groupAvatar}
+                    style={styles.avatar}
+                />
+            );
+        } else {
+            const src = typeof groupAvatar === 'string' ?
+                {uri: delegate.func.fitUrlForAvatarSize(groupAvatar, 48)} :
+                groupAvatar;
+            return <Image style={styles.icon} source={src} />;
+        }
+    };
+}
+
+const styles = StyleSheet.create({
+    container: {
+        backgroundColor: 'white',
+        flex: 1,
+        position: 'absolute',
+        height: height,
+        width: width,
+    },
+    backView: {
+        top: 108,
+        left: 20,
+        width: width - 40,
+        flexDirection: 'row',
+        backgroundColor: 'white',
+    },
+    topLineView: {
+        height: 1,
+        width: width - 40,
+        left: 20,
+        top: 100,
+        backgroundColor: 'rgba(25,31,37,0.08)',
+    },
+    bottomLineView: {
+        height: 1,
+        width: width - 40,
+        left: 20,
+        top: 115,
+        backgroundColor: 'rgba(25,31,37,0.08)',
+    },
+    input: {
+        fontSize: 14,
+        justifyContent: 'center',
+        marginTop: 10,
+        marginHorizontal: 12,
+        ...Platform.select({
+            android: { textAlignVertical: 'top' },
+        }),
+        flex: 1,
+    },
+    avatar: {
+        
+    },
+    icon: {
+        height: 48,
+        width: 48,
+        borderRadius: 24,
+        overflow: 'hidden',
+    },
+    titleText: {
+        height: 40,
+        fontSize: 20,
+        fontWeight: 'bold',
+        textAlign:'center',
+        top: 60,
+        left: 0,
+        width: width,
+    },
+    button: {
+        color: 'rgba(24, 144, 255, 1)',
+        fontSize: 15,
+        textAlign: 'center',
+        width: 120,
+    },
+    buttonView: {
+        backgroundColor: 'rgba(25,31,37,0.08)',
+        height: 40,
+        width: 150,
+        borderRadius: 5,
+        alignItems: 'center',
+        justifyContent: 'center',
+        top: 150,
+        left: (width - 150)/2,
+    },
+});
diff --git a/standard/page/image/showMore@3x.png b/standard/page/image/showMore@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1ebe97f06529e8fb6192e12f01f1516d0c17f6d
GIT binary patch
literal 1974
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k8A#4*i(3PvSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZk1_mb8
z0G|+7pn_2_8Upx3AfZg152#{WNswPKgJSyJBiHX<+}`8I!)#Z-=Jf3oE6Pn7g~BKA
zzI=86%s5H!e_!Uv*FDW;(^>uVkEO|h9|Bn~?nuvDr<(Rli+AG^4y(_BOjAC%9~O@P
zThZ~|jE~(TBj(xG`I?Th-%6tdgWho^PB`C{|44kg#rtbzZ~Fc9Hk>iMG^sG@&_b1F
zwI^;VS3-+RS~ZTP9(A6^@<}Yjm^-0HCi?XZW!777MUB4tI*6QGs{P=?W><;5FHeT8
ze>HL6y<Ku=&-NKE0s4S3$=lt9p@UV{1IXbl@Q5r1(jc}6gWJh$I|c^kEKe85kcwMx
zZ(NNI2^2Z@aB*Kkf<jVX>)M_!J~1|}g?){Ut%hP{<;mNddhg!d_}@-mpC|2HT>4wb
z`NzBOSO2fAe%mR0`!mo;tl-1`j0+nAR}@B7O<s0(*7fCTi(OBLt-Wk?J7w$Hyzu$+
zzR6mZy_zHT?$Xxi^5rr80ewGLrmw%ZQt$pA|NHT#YMbN#hg7riocS9noN44SSK8*t
zm5J9&GPF*o^K@T(d-DB+OJ;5T9ar8;T6&4g#3l$m?Jtb4f3stWl<~d`d()jvR;E2t
zab36K#t#k6(%AiuH`b?r61hHaWu=|z#>|5UUmm;OGc)h?^wz)CPMhykrMds9e#XN3
zT&nxiL%rAOXEuL5Q-14slaROXK_|-{D-M}8ynJGGASt^y^3kWtl5N*qrgxqE`Hk_6
z(O(Ad$KPgsdirag=phU3r4Jf9Cd4e=zjUowme0~%%L;k}f;WbFteebc@cJrq&V($p
zRpy&qWYQ<wMr?`n$-Bt6A#{!5?Jc&qkIs_)_Q0>QA@&wy*=gJADW;N-#IuvWRbPs$
zZ0PtVx55A2&Gl<66|PJC7X6Xn@M%I()8QgtV3evP%vlvuFQgW2dC+C&vlW}3MI5j=
zzV>7vqvzXXuLEv}>NAzq*PNWpcry4D=c%W&E}xopsiE*(#N^N-gRm8I9;~@z92Z%v
zk)Zs1&B+|g75gU7on9@bovjxml3k=1Ihj%XUD8`Oz0=YwuYEfsoPDV^McMGCleI(d
zkHBZE=igk{@i<0w(p5{Rg2n$92JZQ@HT3!wm)2Q#vV%;#J>tUoAH)jnn<Sn3YhL0Z
z3-hB-*2ZKTJSj4`dfd)os<ZFg-0ZV+cWc(M&Ca*vd2p3)<JT=kRx5Uw-wzV577*DQ
zW5q4EYt8%0{!4$V<*x7e8nf+BcC-G&t^R+CM33LO_I=Ot^M9)5S<5E=33&PY(yl1c
zUe%|+tmN4K8Z7nx^h^KLoocVi`FWM$B^Rg9<UF`0{N3y7xc|+Z>Dj7(gRD--eYHxQ
zBYXAMi!~SPW!8)4gzsOi{wg-+)9&YIPr9%CcBby{@%|@ocPmYQb1w7!Vfjbx_xom4
zU00p9V#Cej{_`JyydA%6|DJ&P^VS#7tI_Uvzsw$%75@%vCIAY4cwfu@AhbiW=j@07
zK(1<uYeY#(Vo9o1a#1RfVlXl=GSD?N(ls&;F*LC<G_W$T)HblNGBD6t@0Nq2AvZrI
zGp!Q0hS*R4E&w&SgKQ`+OSei&EKb!eEy`p_%gjl&(%09|$j?pHPfW?p%+t?I&d<|L
x%g-y(FUc(c^WqcDa?34^E7KEm()3f!%nkK`X1vvoR0JBy;OXk;vd$@?2>@A`cM|{r

literal 0
HcmV?d00001

diff --git a/standard/page/index.ts b/standard/page/index.ts
index 0bb5b5c..8789ed0 100644
--- a/standard/page/index.ts
+++ b/standard/page/index.ts
@@ -9,6 +9,7 @@ import GroupListPage from './GroupList';
 import GroupMembersPage from './GroupMembers';
 import GroupAnnouncementEditPage from './GroupAnnouncementEdit';
 import SearchPage from './Search';
+import GroupNameEdit from './GroupNameEdit';
 
 export {
     ChatDetailPage,
@@ -22,4 +23,5 @@ export {
     GroupMembersPage,
     SearchPage,
     GroupAnnouncementEditPage,
+    GroupNameEdit,
 };
diff --git a/standard/pagekey.ts b/standard/pagekey.ts
index 3825e74..6bf6bb7 100644
--- a/standard/pagekey.ts
+++ b/standard/pagekey.ts
@@ -10,3 +10,4 @@ export const GroupMembers = 'IMGroupMembers';
 export const GroupAnnouncementEdit = 'IMGroupAnnouncementEdit';
 export const Search = 'IMSearch';
 export const SearchMore = 'IMSearchMore';
+export const GroupNameEdit = 'IMGroupNameEdit';
diff --git a/standard/typings/Component.ts b/standard/typings/Component.ts
index 67100f4..a6e8287 100644
--- a/standard/typings/Component.ts
+++ b/standard/typings/Component.ts
@@ -1,6 +1,7 @@
 import { StyleProp, ViewStyle, ImageURISource, ImageRequireSource } from 'react-native';
 import * as Props from './Props';
 import * as Message from './Message';
+import {Typings} from '../../standard'
 
 export interface AvatarImageProps extends Props.Conversation {
     style?: StyleProp<ViewStyle>;
@@ -11,6 +12,7 @@ export interface AvatarListProps extends Props.Navigation {
     data: string[];
     canAdd: boolean;
     canRemove: boolean;
+    tempProps: Typings.Action.Setting.Params;
     onAddMembers: (newMemberUserIds: string[]) => void;
     onRemoveMembers: (deletedMemberUserIds: string[]) => void;
 }
diff --git a/standard/typings/Delegate.ts b/standard/typings/Delegate.ts
index 351f09c..1302f10 100644
--- a/standard/typings/Delegate.ts
+++ b/standard/typings/Delegate.ts
@@ -69,6 +69,7 @@ export interface GroupModelPart {
     changeAvatar: (groupId: string, newAvatarUrl: string) => Promise<string>;
     changeAllowInvites: (groupId: string, allowInvites: boolean) => Promise<boolean>;
     changeOwner: (groupId: string, newOwnerId: string) => Promise<{ owner: string; members: string[] }>;
+    showGroupDataRecord:(imId:String) => Promise<void>;
 }
 
 export interface MessageModelPart {
@@ -153,6 +154,7 @@ export interface GroupApiPart {
     changeAvatar: (groupId: string, newAvatarUrl: string) => Promise<void>;
     changeAllowInvites: (groupId: string, newAllowInvites: boolean) => Promise<void>;
     changeOwner: (groupId: string, newOwnerId: string) => Promise<void>;
+    showGroupDataRecord:(imId:String) => Promise<void>;
 }
 
 export interface ApiPart {
@@ -168,7 +170,8 @@ export interface FuncPart {
     pushToUserDetailPage: (userId: string) => void;
     fitUrlForAvatarSize: (avatar: string, size?: number) => string;
     getDefaultUserHeadImage: (userId?: string) => ImageURISource | ImageRequireSource;
-    playVideo:(uri:string) => void;
+    playVideo: (uri: string) => void;
+    getVideoMetaData: (uri: string) => Promise<any>;
     // uploadImages: unset('func.uploadImages'),
 }
 
diff --git a/standard/typings/Message.ts b/standard/typings/Message.ts
index 214f8d3..c66624c 100644
--- a/standard/typings/Message.ts
+++ b/standard/typings/Message.ts
@@ -99,7 +99,7 @@ export interface VoiceBody extends Body {
     localPath: string;
     remotePath: string;
     duration: number;
-    shouldRead?: boolean
+    shouldRead?: boolean;
 }
 
 /**

From c2c34ac8e8f1e9f26f48c23011ee7f98b148acbe Mon Sep 17 00:00:00 2001
From: hanhu <hanhu@hecom.cn>
Date: Thu, 7 Jan 2021 17:54:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/setting/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugin/setting/index.ts b/plugin/setting/index.ts
index 4c32123..b48b8c7 100644
--- a/plugin/setting/index.ts
+++ b/plugin/setting/index.ts
@@ -36,11 +36,7 @@ export function setup() {
         Model.Setting.registerDefault(name, getUi);
     });
     Delegate.page[PageKeys.ChatSetting].defaultProps.sections = [
-<<<<<<< HEAD
         [AvatarList.name],
-=======
-        [AvatarList.name, AllMembers.name],
->>>>>>> master
         [GroupData.name],
         [GroupName.name, GroupAvatar.name, GroupAnnouncement.name, AllowInvite.name, Top.name, Avoid.name, GroupMemberName.name]
     ];