m-im/src/main/res_uikit/layout · d6ce4af11485c7a7612b8827883877f34e14572a · 杨凯 / YDL-Component-Medical

Merge remote-tracking branch 'origin/4.2.60_lp_test' into 4.2.60_lp_test · d6ce4af1

# Conflicts:
#	m-im/src/main/java/com/yidianling/uikit/business/session/view/QuestionInformationView.kt
#	m-im/src/main/res_uikit/layout/im_view_question_infomation.xml

committed Jun 25, 2021

d6ce4af1

Name	Last commit	Last update
..
im_dialog_chat_tips.xml		Loading commit data...
im_expert_info_dialog_layout.xml		Loading commit data...
im_good_grey_icon_layout.xml		Loading commit data...
im_good_icon_layout.xml		Loading commit data...
im_item_collect_info_question_style.xml		Loading commit data...
im_item_view_common_question.xml		Loading commit data...
im_nim_action_bar_custom_view.xml		Loading commit data...
im_nim_action_bar_right_clickable_tv.xml		Loading commit data...
im_nim_actions_item_layout.xml		Loading commit data...
im_nim_advanced_team_announce.xml		Loading commit data...
im_nim_advanced_team_announce_list_item.xml		Loading commit data...
im_nim_advanced_team_create_announce.xml		Loading commit data...
im_nim_advanced_team_info_activity.xml		Loading commit data...
im_nim_advanced_team_info_divider_item.xml		Loading commit data...
im_nim_advanced_team_member_info_layout.xml		Loading commit data...
im_nim_advanced_team_nickname_activity.xml		Loading commit data...
im_nim_ait_contact_label_item.xml		Loading commit data...
im_nim_ait_contact_team_member_item.xml		Loading commit data...
im_nim_capture_video_activity.xml		Loading commit data...
im_nim_chat_confide_order_info_view.xml		Loading commit data...
im_nim_contact_select_area_item.xml		Loading commit data...
im_nim_contact_text_item.xml		Loading commit data...
im_nim_contacts_abc_item.xml		Loading commit data...
im_nim_contacts_item.xml		Loading commit data...
im_nim_contacts_select.xml		Loading commit data...
im_nim_contacts_select_item.xml		Loading commit data...
im_nim_custom_dialog_list_item.xml		Loading commit data...
im_nim_easy_alert_dialog_bottom_button.xml		Loading commit data...
im_nim_easy_alert_dialog_title.xml		Loading commit data...
im_nim_easy_alert_dialog_with_listview.xml		Loading commit data...
im_nim_easy_progress_dialog.xml		Loading commit data...
im_nim_image_layout_multi_touch.xml		Loading commit data...
im_nim_media_item_date.xml		Loading commit data...
im_nim_media_item_normal.xml		Loading commit data...
im_nim_message_activity_actions_layout.xml		Loading commit data...
im_nim_message_activity_bottom_layout.xml		Loading commit data...
im_nim_message_activity_text_layout.xml		Loading commit data...
im_nim_message_item.xml		Loading commit data...
im_nim_message_item_audio.xml		Loading commit data...
im_nim_message_item_notification.xml		Loading commit data...
im_nim_message_item_picture.xml		Loading commit data...
im_nim_message_item_text.xml		Loading commit data...
im_nim_message_item_thumb_progress_bar_text.xml		Loading commit data...
im_nim_message_item_unknown.xml		Loading commit data...
im_nim_message_item_video.xml		Loading commit data...
im_nim_new_message_tip_layout.xml		Loading commit data...
im_nim_read_recipt_layout.xml		Loading commit data...
im_nim_simple_load_more.xml		Loading commit data...
im_nim_team_info_activity.xml		Loading commit data...
im_nim_team_info_divider_item.xml		Loading commit data...
im_nim_team_member_grid_layout.xml		Loading commit data...
im_nim_team_member_item.xml		Loading commit data...
im_nim_team_member_list_layout.xml		Loading commit data...
im_nim_team_name_activity.xml		Loading commit data...
im_nim_ui_title_bar_bottom.xml		Loading commit data...
im_nim_user_profile_toggle_item.xml		Loading commit data...
im_nim_voice_trans_layout.xml		Loading commit data...
im_nim_watch_media_download_progress_layout.xml		Loading commit data...
im_nim_watch_pic_video_menu_activity.xml		Loading commit data...
im_nim_watch_picture_activity.xml		Loading commit data...
im_nim_watch_video_activity.xml		Loading commit data...
im_real_view_in.xml		Loading commit data...
im_real_view_left.xml		Loading commit data...
im_real_view_out.xml		Loading commit data...
im_safe_help_remind_dialog_layout.xml		Loading commit data...
im_user_info_dialog_layout.xml		Loading commit data...
im_view_collect_user_infomation.xml		Loading commit data...
im_view_common_question.xml		Loading commit data...
im_view_question_infomation.xml		Loading commit data...
im_ydl_nim_message_activity.xml		Loading commit data...
im_ydl_nim_message_fragment.xml		Loading commit data...
im_ydl_nim_team_message_activity.xml		Loading commit data...