From a1144d47c85ee933a45563e79bb6c923507797e0 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 26 Feb 2024 14:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A4=BE=E5=8C=BA=E4=B8=8E?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 52 +- .../main/java/com/chwl/app/MainActivity.java | 18 +- .../avroom/room_album/RoomAlbumFragment.kt | 6 +- .../chwl/app/avroom/widget/MessageView.java | 6 +- .../widget/dialog/ChooseWorldsDialog.java | 185 --- .../app/home/activity/CommunityNoticeAct.java | 18 - .../pay/activity/GiveGoldToUserActivity.kt | 2 +- .../com/chwl/app}/photo/BigPagerAdapter.java | 2 +- .../com/chwl/app}/photo/BigPhotoActivity.java | 4 +- .../chwl/app}/photo/BigPhotoItemFragment.java | 4 +- .../app}/photo/OnFragmentOptionListener.java | 2 +- .../java/com/chwl/app}/photo/PagerOption.java | 2 +- .../com/chwl/app}/photo/PhotoAdapter.java | 5 +- .../chwl/app}/photo/PreviewPhotoActivity.java | 6 +- .../com/chwl/app/photo}/ZoomImageView.java | 2 +- .../java/com/chwl/app/ui/im/ImInitHelper.java | 11 - .../com/chwl/app/ui/im/RouterHandler.java | 13 - .../ui/im/chat/MsgViewHolderRedPackage.java | 111 -- .../chwl/app/ui/im/chat/SysMsgViewHolder.java | 2 - .../app/ui/im/recent/RecentListFragment.java | 19 - .../app/ui/user/adapter/UserDesAdapter.java | 381 ------ .../user/adapter/UserInfoDynamicAdapter.java | 250 ---- .../user/fragment/UserInfoDynamicFragment.kt | 169 --- .../ui/widget/higuide/TuTuGuideHelper.java | 2 +- .../app/utils}/DoubleClickCheckListener.java | 2 +- .../com/chwl/app}/utils/ObjectTypeHelper.java | 2 +- .../res/drawable-xhdpi/bg_search_user.webp | Bin .../drawable-xhdpi/ic_arrow_more_publish.png | Bin 0 -> 259 bytes .../res/drawable-xhdpi/ic_arrow_recharge.png | Bin 0 -> 307 bytes .../res/drawable-xhdpi/ic_draw_gift_close.png | Bin 0 -> 826 bytes .../ic_draw_gift_remove_all.png | Bin 0 -> 966 bytes .../ic_draw_gift_remove_last.png | Bin 0 -> 976 bytes .../main/res/drawable-xhdpi/ic_dy_in_room.png | Bin 0 -> 2074 bytes .../ic_first_charge_gift_dialog_enter.webp | Bin .../ic_msg_audio_party_arrow.webp | Bin .../ic_msg_audio_party_arrow_white.webp | Bin .../ic_msg_audio_party_color.webp | Bin .../ic_msg_audio_party_white.webp | Bin .../res/drawable-xhdpi/ic_trash_common.webp | Bin .../res/drawable-xhdpi/ic_withdraw_arrow.webp | Bin .../ic_withdraw_record_arrow.webp | Bin .../res/drawable-xhdpi/icon_dy_add_image.webp | Bin .../res/drawable-xhdpi/icon_dy_delete_pic.png | Bin 0 -> 392 bytes .../icon_dy_delete_preview_photo.webp | Bin .../drawable-xhdpi/icon_dy_list_gif_tag.webp | Bin .../icon_guide_to_chat_in_world_tips.webp | Bin .../res/drawable/bg_ap_water_drop_owner.xml | 0 .../res/drawable/bg_ap_water_drop_self.xml | 0 .../res/drawable/bg_dynamic_topic.xml | 0 .../drawable/bg_mini_world_no_data_button.xml | 0 .../res/drawable/selector_dy_send_btn.xml | 0 .../res/layout/activity_big_photo.xml | 0 .../res/layout/activity_give_gold.xml | 0 .../res/layout/activity_give_gold_detail.xml | 0 .../res/layout/activity_preview_photo.xml | 0 .../res/layout/dialog_dating_select.xml | 0 .../res/layout/dialog_red_package_go_room.xml | 0 .../res/layout/fragment_av_room_game.xml | 0 .../res/layout/fragment_big_photo_item.xml | 0 app/src/main/res/layout/fragment_find_tab.xml | 100 -- .../res/layout/fragment_single_room.xml | 0 .../res/layout/fragment_userinfo_dynamic.xml | 11 - .../res/layout/item_community_notice_list.xml | 0 app/src/main/res/layout/item_home_dynamic.xml | 109 -- .../res/layout/item_preview_photo.xml | 2 +- .../res/layout/item_publish_image.xml | 0 .../main/res/layout/layout_choose_worlds.xml | 44 - .../main/res/layout/layout_des_personal.xml | 28 - app/src/main/res/layout/layout_des_photo.xml | 29 - app/src/main/res/layout/layout_desc_game.xml | 25 - app/src/main/res/layout/layout_desc_voice.xml | 108 -- .../main/res/layout/layout_user_family.xml | 87 -- .../res/layout/layout_user_join_worlds.xml | 24 - .../res/layout/msg_open_audio_party.xml | 0 .../nim_recent_contact_team_list_item.xml | 0 app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/styles.xml | 4 - .../com/chwl/app/community/ConstantValue.java | 10 - .../dynamic/adapter/CommentAdapter.java | 165 --- .../dynamic/adapter/CommentReplyAdapter.java | 74 -- .../dynamic/adapter/WorldDynamicAdapter.java | 319 ----- .../presenter/WorldDynamicPresenter.java | 13 - .../dynamic/view/DynamicDetailActivity.java | 1162 ----------------- .../dynamic/view/IWorldDynamicView.java | 9 - .../dynamic/view/WorldDynamicFragment.java | 387 ------ .../chwl/app/community/helper/CalcSize.java | 21 - .../app/community/helper/DynamicUiHelper.java | 29 - .../app/community/helper/ImageUiHelper.java | 73 -- .../community/helper/ShareDynamicHelper.java | 85 -- .../community/holder/DynamicSysHolder.java | 130 -- .../im/WorldDynamicShareViewHolder.java | 100 -- .../community/photo/DynamicImageAdapter.java | 76 -- .../app/community/publish/ImageAdapter.java | 46 - .../publish/presenter/PublishPresenter.java | 206 --- .../presenter/WorldChoosePresenter.java | 60 - .../community/publish/view/IPublishView.java | 20 - .../publish/view/IWorldsChooseView.java | 11 - .../publish/view/PublishActivity.java | 652 --------- .../publish/view/WorldChooseAdapter.java | 31 - .../publish/view/WorldsChooseFrg.java | 147 --- .../square/SquareDynamicFragment.java | 431 ------ .../app/community/square/SquareFragment.java | 185 --- .../square/adapter/SquareDynamicAdapter.java | 252 ---- .../square/adapter/SquareTopicAdapter.java | 27 - .../user_dynamic/IUserDynamicView.java | 17 - .../user_dynamic/UserDynamicAdapter.java | 285 ---- .../user_dynamic/UserDynamicFrg.java | 259 ---- .../user_dynamic/UserDynamicPresenter.java | 143 -- .../app/community/utils/Glide4Engine.java | 87 -- .../app/community/utils/TopicUpTextWrapper.kt | 34 - .../widget/DynamicNickDetailWidget.java | 113 -- .../community/widget/ExpandableTextView.java | 533 -------- .../app/community/widget/GridImageWidget.java | 135 -- .../app/community/widget/TopicLabelWidget.kt | 50 - .../widget/TouchHideKeyboardView.java | 36 - .../drawable-xhdpi/bg_dy_popup_comment.webp | Bin 1044 -> 0 bytes .../bg_dy_popup_comment_three.webp | Bin 1048 -> 0 bytes .../drawable-xhdpi/ic_arrow_more_publish.webp | Bin 188 -> 0 bytes .../res/drawable-xhdpi/ic_back_dynamic.webp | Bin 296 -> 0 bytes .../res/drawable-xhdpi/ic_box_dynamic.webp | Bin 330 -> 0 bytes .../res/drawable-xhdpi/ic_close_publish.webp | Bin 342 -> 0 bytes .../ic_communicate_community_list.webp | Bin 400 -> 0 bytes .../res/drawable-xhdpi/ic_dy_in_room.webp | Bin 1582 -> 0 bytes .../drawable-xhdpi/ic_dy_square_in_room.webp | Bin 1152 -> 0 bytes .../ic_female_age_community_notice.webp | Bin 1036 -> 0 bytes .../res/drawable-xhdpi/ic_img_dynamic.webp | Bin 406 -> 0 bytes .../ic_like_community_list.webp | Bin 412 -> 0 bytes .../ic_male_community_notice.webp | Bin 1476 -> 0 bytes .../ic_more_community_list.webp | Bin 142 -> 0 bytes .../ic_name_community_notice_list.webp | Bin 358 -> 0 bytes .../ic_share_community_list.webp | Bin 402 -> 0 bytes .../res/drawable-xhdpi/ic_square_live.webp | Bin 382 -> 0 bytes .../res/drawable-xhdpi/ic_square_publish.webp | Bin 7620 -> 0 bytes .../res/drawable-xhdpi/ic_text_dynamic.webp | Bin 318 -> 0 bytes .../res/drawable-xhdpi/ic_topic_close.webp | Bin 190 -> 0 bytes .../drawable-xhdpi/ic_translate_dynamic.webp | Bin 312 -> 0 bytes .../ic_translate_selected_dynamic.webp | Bin 344 -> 0 bytes .../res/drawable-xhdpi/ic_video_dynamic.webp | Bin 318 -> 0 bytes .../res/drawable-xhdpi/ic_voice_dynamic.webp | Bin 306 -> 0 bytes .../drawable-xhdpi/icon_dy_delete_pic.webp | Bin 312 -> 0 bytes .../icon_dy_detail_comment.webp | Bin 360 -> 0 bytes .../drawable-xhdpi/icon_dy_detail_share.webp | Bin 358 -> 0 bytes .../icon_dy_dynamic_publisher.webp | Bin 594 -> 0 bytes .../res/drawable-xhdpi/icon_dy_emoji.webp | Bin 1102 -> 0 bytes .../drawable-xhdpi/icon_dy_first_dynamic.webp | Bin 400 -> 0 bytes .../res/drawable-xhdpi/icon_dy_item_more.webp | Bin 710 -> 0 bytes .../drawable-xhdpi/icon_dy_list_comment.webp | Bin 1388 -> 0 bytes .../drawable-xhdpi/icon_dy_list_female.webp | Bin 158 -> 0 bytes .../res/drawable-xhdpi/icon_dy_list_like.webp | Bin 2534 -> 0 bytes .../icon_dy_list_like_00000.webp | Bin 512 -> 0 bytes .../icon_dy_list_like_00001.webp | Bin 810 -> 0 bytes .../icon_dy_list_like_00002.webp | Bin 1094 -> 0 bytes .../icon_dy_list_like_00003.webp | Bin 1240 -> 0 bytes .../icon_dy_list_like_00004.webp | Bin 1368 -> 0 bytes .../icon_dy_list_like_00005.webp | Bin 1558 -> 0 bytes .../icon_dy_list_like_00006.webp | Bin 1676 -> 0 bytes .../icon_dy_list_like_00007.webp | Bin 1646 -> 0 bytes .../icon_dy_list_like_00008.webp | Bin 1534 -> 0 bytes .../icon_dy_list_like_00009.webp | Bin 1396 -> 0 bytes .../icon_dy_list_like_00010.webp | Bin 1016 -> 0 bytes .../icon_dy_list_like_00011.webp | Bin 902 -> 0 bytes .../icon_dy_list_like_00012.webp | Bin 830 -> 0 bytes .../icon_dy_list_like_00013.webp | Bin 512 -> 0 bytes .../icon_dy_list_like_false.webp | Bin 788 -> 0 bytes .../icon_dy_list_like_true.webp | Bin 378 -> 0 bytes .../res/drawable-xhdpi/icon_dy_list_male.webp | Bin 144 -> 0 bytes .../drawable-xhdpi/icon_dy_list_share.webp | Bin 978 -> 0 bytes .../res/drawable-xhdpi/icon_dy_miniworld.webp | Bin 356 -> 0 bytes .../drawable-xhdpi/icon_dy_popup_copy.webp | Bin 188 -> 0 bytes .../drawable-xhdpi/icon_dy_popup_delete.webp | Bin 184 -> 0 bytes .../drawable-xhdpi/icon_dy_popup_report.webp | Bin 310 -> 0 bytes .../icon_dy_publish_examine.webp | Bin 6420 -> 0 bytes .../drawable-xhdpi/icon_dy_publish_false.webp | Bin 310 -> 0 bytes .../drawable-xhdpi/icon_dy_publish_true.webp | Bin 608 -> 0 bytes .../icon_square_dynamic_comment.webp | Bin 826 -> 0 bytes .../icon_square_dynamic_like_checked.webp | Bin 1940 -> 0 bytes .../icon_square_dynamic_like_normal.webp | Bin 1308 -> 0 bytes .../icon_square_dynamic_more.webp | Bin 156 -> 0 bytes .../icon_square_dynamic_share.webp | Bin 756 -> 0 bytes .../res/drawable-xhdpi/icon_top.webp | Bin 370 -> 0 bytes .../res/drawable/anim_list_dy_like.xml | 61 - .../res/drawable/bg_round_1affbc51_9_4.xml | 11 - .../btn_translate_dynamic_selector.xml | 5 - .../res/drawable/divider_flexlayout.xml | 6 - .../selector_dy_publish_btn_status.xml | 5 - .../drawable/shape_bg_mini_world_added.xml | 17 - .../res/drawable/shape_bg_mini_world_name.xml | 5 - .../res/drawable/shape_bg_square_list.xml | 5 - .../res/drawable/shape_round.xml | 5 - .../res/drawable/topic_up_drawable.xml | 4 - .../res/layout/activity_dynamic_detail.xml | 107 -- .../res/layout/activity_publish.xml | 207 --- .../res/layout/dialog_dy_publish_success.xml | 50 - .../res/layout/dy_empty_dynamic_comment.xml | 31 - .../res/layout/dy_footer_loadmore.xml | 29 - .../res/layout/fragment_square.xml | 83 -- .../res/layout/fragment_square_dynamic.xml | 26 - .../res/layout/fragment_world_dynamic.xml | 22 - .../res/layout/frg_user_dynamic.xml | 23 - .../res/layout/frg_worlds_choose.xml | 21 - .../res/layout/head_dynamic_detail.xml | 304 ----- .../res/layout/item_dy_comment.xml | 102 -- .../res/layout/item_dy_reply.xml | 86 -- .../res/layout/item_dynamic_image.xml | 33 - .../res/layout/item_dynamic_sys.xml | 39 - .../res/layout/item_grid_image_widget.xml | 30 - .../res/layout/item_label_mini_world.xml | 16 - .../res/layout/item_reply_footer_view.xml | 10 - .../res/layout/item_square_dynamic.xml | 273 ---- .../res/layout/item_square_topic.xml | 24 - .../res/layout/item_user_dynamic_image.xml | 30 - .../res/layout/item_user_dynamic_list.xml | 269 ---- .../res/layout/item_userinfo_dynamic.xml | 232 ---- .../res/layout/item_world_dynamic.xml | 282 ---- .../res/layout/item_worlds_choose.xml | 63 - .../res/layout/layout_dy_nick_detail.xml | 131 -- .../res/layout/message_item_red_package.xml | 72 - .../res/layout/popup_dy_comment.xml | 51 - .../view_holder_world_dynamic_share.xml | 60 - .../res/layout/widget_grid_image.xml | 11 - app/src/module_community/res/values/attrs.xml | 18 - .../module_community/res/values/dimens.xml | 9 - .../module_community/res/values/strings.xml | 22 - .../res/layout/include_user_module_hall.xml | 91 -- .../miniworld/activity/AllTopicActivity.java | 184 --- .../miniworld/activity/AudioPartyDialog.java | 259 ---- .../activity/MWTeamRoomMessageAct.java | 754 ----------- .../miniworld/activity/MiniWorldActivity.java | 232 ---- .../activity/MiniWorldEditActivity.java | 365 ------ .../activity/MiniWorldGroupThemeActivity.java | 179 --- .../activity/MiniWorldGuestPageActivity.java | 989 -------------- .../activity/MiniWorldMainActivity.java | 320 ----- .../activity/MiniWorldMemberListActivity.java | 260 ---- .../activity/MiniWorldSearchActivity.java | 258 ---- .../MiniWorldTeamMessageActivity.java | 970 -------------- .../miniworld/activity/TopicMainActivity.java | 639 --------- .../adapter/AllTopicListAdapter.java | 30 - .../miniworld/adapter/AudioPartyAdapter.java | 74 -- .../adapter/GuestAudioPartyAdapter.java | 26 - .../adapter/MiniWorldEditClassifyAdapter.java | 50 - .../adapter/MiniWorldListAdapter.java | 65 - .../adapter/MiniWorldMainAdapter.java | 105 -- .../adapter/MiniWorldMemberListAdapter.java | 143 -- .../adapter/RecommendTopicListAdapter.java | 34 - .../fragment/MiniWorldCategoryFragment.java | 261 ---- .../fragment/MiniWorldNoticeFrg.java | 99 -- .../presenter/AudioPartyDialogPresenter.java | 151 --- .../presenter/MWTeamMessagePresenter.java | 243 ---- .../miniworld/presenter/MWThemePresenter.java | 50 - .../presenter/MiniWorldCategoryPresenter.java | 74 -- .../presenter/MiniWorldEditPresenter.java | 142 -- .../MiniWorldGuestPagePresenter.java | 280 ---- .../presenter/MiniWorldMainPresenter.java | 125 -- .../MiniWorldMemberListPresenter.java | 212 --- .../presenter/MiniWorldNoticePresenter.java | 24 - .../presenter/MiniWorldPresenter.java | 51 - .../presenter/MiniWorldSearchPresenter.java | 57 - .../miniworld/view/IAudioPartyDialogView.java | 5 - .../miniworld/view/IMWTeamMessageView.java | 23 - .../chwl/app/miniworld/view/IMWThemeView.java | 14 - .../view/IMiniWorldCategoryView.java | 18 - .../miniworld/view/IMiniWorldEditView.java | 24 - .../miniworld/view/IMiniWorldGuestPage.java | 58 - .../miniworld/view/IMiniWorldMainView.java | 14 - .../view/IMiniWorldMemberListView.java | 58 - .../miniworld/view/IMiniWorldNoticeView.java | 6 - .../miniworld/view/IMiniWorldSearchView.java | 17 - .../app/miniworld/view/IMiniWorldView.java | 25 - .../viewmodel/MiniWorldDetailInfoVM.java | 164 --- .../viewmodel/MiniWorldEditableInfoVM.java | 74 -- .../miniworld/widget/MWMagicIndicator.java | 70 - .../MiniWorldEditChooseClassifyDialog.java | 123 -- ...color_mini_world_edit_world_permission.xml | 5 - .../res/drawable-xhdpi/arrow_right_white.webp | Bin 196 -> 0 bytes .../res/drawable-xhdpi/bg_guide_empty.webp | Bin 82 -> 0 bytes .../bg_mini_world_group_theme.webp | Bin 3610 -> 0 bytes .../bg_mini_world_group_theme_edit.webp | Bin 972 -> 0 bytes .../res/drawable-xhdpi/ic_arrow_recharge.webp | Bin 146 -> 0 bytes .../res/drawable-xhdpi/ic_charge_arrow.webp | Bin 146 -> 0 bytes .../drawable-xhdpi/ic_draw_gift_close.webp | Bin 342 -> 0 bytes .../ic_draw_gift_remove_all.webp | Bin 406 -> 0 bytes .../ic_draw_gift_remove_last.webp | Bin 434 -> 0 bytes .../ic_guide_mini_world_main_copywriting.webp | Bin 8936 -> 0 bytes .../res/drawable-xhdpi/ic_img_only.webp | Bin 804 -> 0 bytes .../ic_mini_world_edit_choose_classify.webp | Bin 388 -> 0 bytes .../ic_mini_world_edit_cover_add.webp | Bin 292 -> 0 bytes ...ic_mini_world_edit_permission_checked.webp | Bin 365 -> 0 bytes ..._mini_world_edit_permission_unchecked.webp | Bin 325 -> 0 bytes .../ic_mini_world_edit_question.webp | Bin 174 -> 0 bytes .../ic_mini_world_guest_page_chat.webp | Bin 590 -> 0 bytes .../ic_mini_world_guest_page_declare.webp | Bin 1254 -> 0 bytes ...t_page_dialog_complete_operation_icon.webp | Bin 5732 -> 0 bytes ..._guest_page_dialog_no_group_chat_icon.webp | Bin 1220 -> 0 bytes .../ic_mini_world_guest_page_dissolve.webp | Bin 958 -> 0 bytes .../ic_mini_world_guest_page_edit.webp | Bin 652 -> 0 bytes .../ic_mini_world_guest_page_member.webp | Bin 502 -> 0 bytes .../ic_mini_world_guest_page_member_more.webp | Bin 154 -> 0 bytes ...orld_guest_page_message_no_disturbing.webp | Bin 702 -> 0 bytes ...uest_page_message_no_disturbing_close.webp | Bin 1040 -> 0 bytes .../ic_mini_world_guest_page_more.webp | Bin 126 -> 0 bytes ...ic_mini_world_guest_page_notice_label.webp | Bin 1018 -> 0 bytes ..._mini_world_guest_page_notice_no_data.webp | Bin 9930 -> 0 bytes ...ld_guest_page_notice_originator_label.webp | Bin 1146 -> 0 bytes ..._world_guest_page_popup_menu_triangle.webp | Bin 114 -> 0 bytes .../ic_mini_world_guest_page_quit.webp | Bin 706 -> 0 bytes .../ic_mini_world_guest_page_report.webp | Bin 784 -> 0 bytes .../ic_mini_world_list_clickable_gray.webp | Bin 202 -> 0 bytes .../ic_mini_world_main_find.webp | Bin 1216 -> 0 bytes .../ic_mini_world_main_hot.webp | Bin 382 -> 0 bytes .../ic_mini_world_main_new.webp | Bin 354 -> 0 bytes .../ic_mini_world_main_official.webp | Bin 276 -> 0 bytes .../ic_mini_world_main_partying.webp | Bin 546 -> 0 bytes .../ic_mini_world_member_list_in_party.webp | Bin 1280 -> 0 bytes .../ic_mini_world_member_list_remove.webp | Bin 1208 -> 0 bytes .../ic_mini_world_member_list_search.webp | Bin 884 -> 0 bytes .../ic_mini_world_person_count.webp | Bin 192 -> 0 bytes .../drawable-xhdpi/ic_mini_world_team.webp | Bin 914 -> 0 bytes .../res/drawable-xhdpi/ic_mw_creator.webp | Bin 1104 -> 0 bytes .../res/drawable-xhdpi/ic_mw_img_click.webp | Bin 906 -> 0 bytes .../ic_mw_img_click_pressed.webp | Bin 1000 -> 0 bytes .../res/drawable-xhdpi/ic_mw_join_succee.webp | Bin 5726 -> 0 bytes .../res/drawable-xhdpi/ic_publish.webp | Bin 1054 -> 0 bytes .../res/drawable-xhdpi/ic_to_mini_world.webp | Bin 1658 -> 0 bytes .../icon_mini_world_group_edit.webp | Bin 340 -> 0 bytes .../res/drawable-xhdpi/icon_party_arrow.webp | Bin 404 -> 0 bytes .../drawable-xhdpi/icon_party_tips_close.webp | Bin 200 -> 0 bytes .../res/drawable-xhdpi/mw_start41.webp | Bin 23520 -> 0 bytes .../res/drawable-xhdpi/mw_start42.webp | Bin 1234 -> 0 bytes .../res/drawable-xhdpi/mw_start51.webp | Bin 13186 -> 0 bytes .../res/drawable-xhdpi/mw_start52.webp | Bin 2520 -> 0 bytes .../res/drawable-xhdpi/mw_start53.webp | Bin 17386 -> 0 bytes .../nim_bg_message_red_package.webp | Bin 498 -> 0 bytes .../drawable-xhdpi/nim_ic_red_package.webp | Bin 1060 -> 0 bytes .../drawable-xhdpi/shape_trans_radius_10.xml | 6 - .../drawable-xhdpi/shape_white_radius_22.xml | 6 - .../drawable-xxhdpi/ic_mini_world_team.webp | Bin 1410 -> 0 bytes .../res/drawable-xxhdpi/ic_mw_creator.webp | Bin 1762 -> 0 bytes .../icon_guide_to_add_world_tips.webp | Bin 15222 -> 0 bytes .../res/drawable-xxhdpi/mw_start41.webp | Bin 34352 -> 0 bytes .../res/drawable-xxhdpi/mw_start42.webp | Bin 2246 -> 0 bytes .../res/drawable-xxhdpi/mw_start51.webp | Bin 18064 -> 0 bytes .../res/drawable-xxhdpi/mw_start52.webp | Bin 3594 -> 0 bytes .../res/drawable-xxhdpi/mw_start53.webp | Bin 35590 -> 0 bytes .../res/drawable/bg_appcolor_333_0_275.xml | 12 - .../res/drawable/bg_audio_party_dialog.xml | 12 - .../drawable/bg_audio_party_list_dialog.xml | 7 - .../res/drawable/bg_item_join_audio_party.xml | 8 - .../bg_item_join_audio_party_owner.xml | 8 - .../res/drawable/bg_layer.xml | 25 - .../bg_mini_world_edit_choose_classify.xml | 8 - ...g_mini_world_edit_choose_classify_item.xml | 6 - .../bg_mini_world_edit_cover_default.xml | 6 - .../bg_mini_world_edit_save_button.xml | 5 - .../bg_mini_world_edit_save_button_enable.xml | 6 - .../bg_mini_world_edit_save_button_normal.xml | 6 - .../bg_mini_world_edit_world_edit.xml | 6 - ...bg_mini_world_guest_page_bottom_button.xml | 6 - .../bg_mini_world_guest_page_dialog.xml | 6 - ...bg_mini_world_guest_page_dialog_button.xml | 12 - ..._world_guest_page_dialog_button_yellow.xml | 11 - ...bg_mini_world_guest_page_invite_button.xml | 6 - .../bg_mini_world_guest_page_notice.xml | 6 - .../bg_mini_world_member_list_search_bar.xml | 12 - ...g_mini_world_member_list_search_button.xml | 9 - .../res/drawable/bg_mwg_theme.xml | 8 - .../res/drawable/bg_mwg_theme_able.xml | 8 - .../res/drawable/bg_mwg_theme_unable.xml | 8 - .../res/drawable/bg_theme_random.xml | 10 - .../res/drawable/bg_theme_save.xml | 5 - .../res/drawable/bg_un_read_team_message.xml | 8 - .../res/drawable/bg_water_drop_other.xml | 18 - .../res/drawable/bg_water_drop_owner.xml | 19 - .../res/drawable/bg_water_drop_self.xml | 18 - .../res/drawable/bg_while_circle.xml | 7 - .../res/drawable/bg_white_333_0_275.xml | 12 - ...drawable_mini_world_member_list_online.xml | 12 - .../rb_mini_world_edit_permission_icon.xml | 6 - .../res/drawable/selector_mw_img_click.xml | 8 - .../shape_bg_nimi_world_search_item.xml | 10 - .../layout/act_mini_world_group_message.xml | 159 --- .../res/layout/act_mini_world_group_theme.xml | 77 -- .../res/layout/act_mw_room_group_message.xml | 134 -- .../res/layout/activity_all_topic.xml | 33 - .../res/layout/activity_mini_world.xml | 32 - .../res/layout/activity_mini_world_edit.xml | 316 ----- .../layout/activity_mini_world_guest_page.xml | 405 ------ .../res/layout/activity_mini_world_main.xml | 88 -- .../activity_mini_world_member_list.xml | 88 -- .../res/layout/activity_mini_world_search.xml | 99 -- .../res/layout/activity_topic_main.xml | 124 -- .../res/layout/dialog_audio_party.xml | 83 -- ...dialog_mini_world_edit_choose_classify.xml | 23 - ...ni_world_guest_page_complete_operation.xml | 39 - .../dialog_mini_world_guest_page_invite.xml | 68 - .../res/layout/dialog_mw_comfirm.xml | 54 - .../res/layout/dialog_mw_join_succee.xml | 58 - .../layout/fragment_mini_world_category.xml | 17 - .../fragment_mini_world_category_my_empty.xml | 35 - .../res/layout/frg_mini_world_notice.xml | 123 -- .../res/layout/item_all_topic_list.xml | 54 - .../res/layout/item_audio_party.xml | 110 -- .../res/layout/item_guest_audio_party.xml | 49 - .../item_mini_world_edit_choose_classify.xml | 31 - .../res/layout/item_mini_world_list.xml | 102 -- .../item_mini_world_main_bottom_padding.xml | 7 - .../layout/item_mini_world_main_divider.xml | 11 - .../res/layout/item_mini_world_main_find.xml | 36 - .../res/layout/item_mini_world_main_item.xml | 176 --- .../item_mini_world_main_placeholder.xml | 25 - .../res/layout/item_mini_world_main_title.xml | 15 - .../layout/item_mini_world_member_avatar.xml | 8 - .../layout/item_mini_world_member_list.xml | 125 -- .../res/layout/item_out_mw_owner.xml | 60 - .../res/layout/item_recommend_topic_list.xml | 36 - .../res/layout/layout_audio_empty.xml | 21 - .../layout_mini_world_main_banner_header.xml | 22 - .../layout/layout_mini_world_main_guide.xml | 36 - .../layout/layout_start_mw_team_message.xml | 51 - .../res/layout/menu_mini_world_guest_page.xml | 6 - .../menu_mini_world_guest_page_member.xml | 68 - ...i_world_guest_page_member_no_chat_room.xml | 68 - .../menu_mini_world_guest_page_originator.xml | 68 - ...rld_guest_page_originator_no_chat_room.xml | 68 - .../menu_mini_world_guest_page_stranger.xml | 50 - .../module_mini_world/res/values/colors.xml | 11 - .../module_mini_world/res/values/strings.xml | 39 - .../module_mini_world/res/values/styles.xml | 45 - .../fragment/RoomMsgRecentListFragment.java | 3 - 428 files changed, 56 insertions(+), 23398 deletions(-) delete mode 100644 app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/BigPagerAdapter.java (98%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/BigPhotoActivity.java (99%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/BigPhotoItemFragment.java (99%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/OnFragmentOptionListener.java (80%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/PagerOption.java (96%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/PhotoAdapter.java (97%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/photo/PreviewPhotoActivity.java (97%) rename app/src/{module_community/java/com/chwl/app/community/widget => main/java/com/chwl/app/photo}/ZoomImageView.java (99%) delete mode 100644 app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java delete mode 100644 app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java delete mode 100644 app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java delete mode 100644 app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt rename app/src/{module_mini_world/java/com/chwl/app/miniworld/listener => main/java/com/chwl/app/utils}/DoubleClickCheckListener.java (95%) rename app/src/{module_community/java/com/chwl/app/community => main/java/com/chwl/app}/utils/ObjectTypeHelper.java (98%) rename app/src/{module_community => main}/res/drawable-xhdpi/bg_search_user.webp (100%) create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_more_publish.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_recharge.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_draw_gift_close.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_draw_gift_remove_all.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_draw_gift_remove_last.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_dy_in_room.png rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_first_charge_gift_dialog_enter.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_msg_audio_party_arrow.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_msg_audio_party_arrow_white.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_msg_audio_party_color.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_msg_audio_party_white.webp (100%) rename app/src/{module_community => main}/res/drawable-xhdpi/ic_trash_common.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_withdraw_arrow.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xhdpi/ic_withdraw_record_arrow.webp (100%) rename app/src/{module_community => main}/res/drawable-xhdpi/icon_dy_add_image.webp (100%) create mode 100644 app/src/main/res/drawable-xhdpi/icon_dy_delete_pic.png rename app/src/{module_community => main}/res/drawable-xhdpi/icon_dy_delete_preview_photo.webp (100%) rename app/src/{module_community => main}/res/drawable-xhdpi/icon_dy_list_gif_tag.webp (100%) rename app/src/{module_mini_world => main}/res/drawable-xxhdpi/icon_guide_to_chat_in_world_tips.webp (100%) rename app/src/{module_mini_world => main}/res/drawable/bg_ap_water_drop_owner.xml (100%) rename app/src/{module_mini_world => main}/res/drawable/bg_ap_water_drop_self.xml (100%) rename app/src/{module_community => main}/res/drawable/bg_dynamic_topic.xml (100%) rename app/src/{module_mini_world => main}/res/drawable/bg_mini_world_no_data_button.xml (100%) rename app/src/{module_community => main}/res/drawable/selector_dy_send_btn.xml (100%) rename app/src/{module_community => main}/res/layout/activity_big_photo.xml (100%) rename app/src/{module_community => main}/res/layout/activity_give_gold.xml (100%) rename app/src/{module_community => main}/res/layout/activity_give_gold_detail.xml (100%) rename app/src/{module_community => main}/res/layout/activity_preview_photo.xml (100%) rename app/src/{module_community => main}/res/layout/dialog_dating_select.xml (100%) rename app/src/{module_community => main}/res/layout/dialog_red_package_go_room.xml (100%) rename app/src/{module_mini_world => main}/res/layout/fragment_av_room_game.xml (100%) rename app/src/{module_community => main}/res/layout/fragment_big_photo_item.xml (100%) delete mode 100644 app/src/main/res/layout/fragment_find_tab.xml rename app/src/{module_mini_world => main}/res/layout/fragment_single_room.xml (100%) delete mode 100644 app/src/main/res/layout/fragment_userinfo_dynamic.xml rename app/src/{module_community => main}/res/layout/item_community_notice_list.xml (100%) delete mode 100644 app/src/main/res/layout/item_home_dynamic.xml rename app/src/{module_community => main}/res/layout/item_preview_photo.xml (95%) rename app/src/{module_community => main}/res/layout/item_publish_image.xml (100%) delete mode 100644 app/src/main/res/layout/layout_choose_worlds.xml delete mode 100644 app/src/main/res/layout/layout_des_personal.xml delete mode 100644 app/src/main/res/layout/layout_des_photo.xml delete mode 100644 app/src/main/res/layout/layout_desc_game.xml delete mode 100644 app/src/main/res/layout/layout_desc_voice.xml delete mode 100644 app/src/main/res/layout/layout_user_family.xml delete mode 100644 app/src/main/res/layout/layout_user_join_worlds.xml rename app/src/{module_mini_world => main}/res/layout/msg_open_audio_party.xml (100%) rename app/src/{module_mini_world => main}/res/layout/nim_recent_contact_team_list_item.xml (100%) delete mode 100644 app/src/module_community/java/com/chwl/app/community/ConstantValue.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/adapter/CommentAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/adapter/CommentReplyAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/adapter/WorldDynamicAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/presenter/WorldDynamicPresenter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/view/IWorldDynamicView.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/dynamic/view/WorldDynamicFragment.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/helper/CalcSize.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/helper/DynamicUiHelper.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/helper/ImageUiHelper.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/helper/ShareDynamicHelper.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/holder/DynamicSysHolder.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/im/WorldDynamicShareViewHolder.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/photo/DynamicImageAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/ImageAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/presenter/PublishPresenter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/presenter/WorldChoosePresenter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/view/IPublishView.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/view/IWorldsChooseView.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/view/PublishActivity.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/view/WorldChooseAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/publish/view/WorldsChooseFrg.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/square/SquareDynamicFragment.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/square/adapter/SquareDynamicAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/square/adapter/SquareTopicAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/user_dynamic/IUserDynamicView.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicAdapter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicPresenter.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/utils/TopicUpTextWrapper.kt delete mode 100644 app/src/module_community/java/com/chwl/app/community/widget/DynamicNickDetailWidget.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/widget/ExpandableTextView.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/widget/GridImageWidget.java delete mode 100644 app/src/module_community/java/com/chwl/app/community/widget/TopicLabelWidget.kt delete mode 100644 app/src/module_community/java/com/chwl/app/community/widget/TouchHideKeyboardView.java delete mode 100644 app/src/module_community/res/drawable-xhdpi/bg_dy_popup_comment.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/bg_dy_popup_comment_three.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_arrow_more_publish.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_back_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_box_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_close_publish.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_communicate_community_list.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_dy_in_room.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_dy_square_in_room.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_female_age_community_notice.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_img_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_like_community_list.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_male_community_notice.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_more_community_list.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_name_community_notice_list.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_share_community_list.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_square_live.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_square_publish.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_text_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_topic_close.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_translate_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_translate_selected_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_video_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_voice_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_delete_pic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_detail_comment.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_detail_share.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_dynamic_publisher.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_emoji.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_first_dynamic.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_item_more.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_female.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00000.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00001.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00002.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00003.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00004.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00005.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00006.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00007.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00008.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00009.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00010.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00011.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00012.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_00013.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_false.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_true.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_male.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_list_share.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_miniworld.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_popup_copy.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_popup_delete.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_popup_report.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_publish_examine.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_publish_false.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_dy_publish_true.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_comment.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_checked.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_more.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_share.webp delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_top.webp delete mode 100644 app/src/module_community/res/drawable/anim_list_dy_like.xml delete mode 100644 app/src/module_community/res/drawable/bg_round_1affbc51_9_4.xml delete mode 100644 app/src/module_community/res/drawable/btn_translate_dynamic_selector.xml delete mode 100644 app/src/module_community/res/drawable/divider_flexlayout.xml delete mode 100644 app/src/module_community/res/drawable/selector_dy_publish_btn_status.xml delete mode 100644 app/src/module_community/res/drawable/shape_bg_mini_world_added.xml delete mode 100644 app/src/module_community/res/drawable/shape_bg_mini_world_name.xml delete mode 100644 app/src/module_community/res/drawable/shape_bg_square_list.xml delete mode 100644 app/src/module_community/res/drawable/shape_round.xml delete mode 100644 app/src/module_community/res/drawable/topic_up_drawable.xml delete mode 100644 app/src/module_community/res/layout/activity_dynamic_detail.xml delete mode 100644 app/src/module_community/res/layout/activity_publish.xml delete mode 100644 app/src/module_community/res/layout/dialog_dy_publish_success.xml delete mode 100644 app/src/module_community/res/layout/dy_empty_dynamic_comment.xml delete mode 100644 app/src/module_community/res/layout/dy_footer_loadmore.xml delete mode 100644 app/src/module_community/res/layout/fragment_square.xml delete mode 100644 app/src/module_community/res/layout/fragment_square_dynamic.xml delete mode 100644 app/src/module_community/res/layout/fragment_world_dynamic.xml delete mode 100644 app/src/module_community/res/layout/frg_user_dynamic.xml delete mode 100644 app/src/module_community/res/layout/frg_worlds_choose.xml delete mode 100644 app/src/module_community/res/layout/head_dynamic_detail.xml delete mode 100644 app/src/module_community/res/layout/item_dy_comment.xml delete mode 100644 app/src/module_community/res/layout/item_dy_reply.xml delete mode 100644 app/src/module_community/res/layout/item_dynamic_image.xml delete mode 100644 app/src/module_community/res/layout/item_dynamic_sys.xml delete mode 100644 app/src/module_community/res/layout/item_grid_image_widget.xml delete mode 100644 app/src/module_community/res/layout/item_label_mini_world.xml delete mode 100644 app/src/module_community/res/layout/item_reply_footer_view.xml delete mode 100644 app/src/module_community/res/layout/item_square_dynamic.xml delete mode 100644 app/src/module_community/res/layout/item_square_topic.xml delete mode 100644 app/src/module_community/res/layout/item_user_dynamic_image.xml delete mode 100644 app/src/module_community/res/layout/item_user_dynamic_list.xml delete mode 100644 app/src/module_community/res/layout/item_userinfo_dynamic.xml delete mode 100644 app/src/module_community/res/layout/item_world_dynamic.xml delete mode 100644 app/src/module_community/res/layout/item_worlds_choose.xml delete mode 100644 app/src/module_community/res/layout/layout_dy_nick_detail.xml delete mode 100644 app/src/module_community/res/layout/message_item_red_package.xml delete mode 100644 app/src/module_community/res/layout/popup_dy_comment.xml delete mode 100644 app/src/module_community/res/layout/view_holder_world_dynamic_share.xml delete mode 100644 app/src/module_community/res/layout/widget_grid_image.xml delete mode 100644 app/src/module_community/res/values/attrs.xml delete mode 100644 app/src/module_community/res/values/dimens.xml delete mode 100644 app/src/module_community/res/values/strings.xml delete mode 100644 app/src/module_labour_union/res/layout/include_user_module_hall.xml delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AllTopicActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AudioPartyDialog.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MWTeamRoomMessageAct.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldEditActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGroupThemeActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGuestPageActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMainActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMemberListActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldSearchActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldTeamMessageActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/activity/TopicMainActivity.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AllTopicListAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AudioPartyAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/GuestAudioPartyAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldListAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMainAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMemberListAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/RecommendTopicListAdapter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldCategoryFragment.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldNoticeFrg.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/AudioPartyDialogPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWTeamMessagePresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWThemePresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldCategoryPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldEditPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldGuestPagePresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMainPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMemberListPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldNoticePresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldSearchPresenter.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IAudioPartyDialogView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWTeamMessageView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWThemeView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldCategoryView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldEditView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldGuestPage.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMainView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMemberListView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldNoticeView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldSearchView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldView.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MWMagicIndicator.java delete mode 100644 app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java delete mode 100644 app/src/module_mini_world/res/color/color_mini_world_edit_world_permission.xml delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/arrow_right_white.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/bg_guide_empty.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/bg_mini_world_group_theme.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/bg_mini_world_group_theme_edit.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_arrow_recharge.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_charge_arrow.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_draw_gift_close.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_draw_gift_remove_all.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_draw_gift_remove_last.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_guide_mini_world_main_copywriting.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_img_only.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_edit_choose_classify.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_edit_cover_add.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_edit_permission_checked.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_edit_permission_unchecked.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_edit_question.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_chat.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_declare.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_dialog_complete_operation_icon.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_dialog_no_group_chat_icon.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_dissolve.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_edit.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_member.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_member_more.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_message_no_disturbing.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_message_no_disturbing_close.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_more.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_notice_label.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_notice_no_data.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_notice_originator_label.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_popup_menu_triangle.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_quit.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_guest_page_report.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_list_clickable_gray.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_main_find.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_main_hot.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_main_new.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_main_official.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_main_partying.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_member_list_in_party.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_member_list_remove.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_member_list_search.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_person_count.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mini_world_team.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mw_creator.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mw_img_click.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mw_img_click_pressed.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_mw_join_succee.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_publish.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/ic_to_mini_world.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/icon_mini_world_group_edit.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/icon_party_arrow.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/icon_party_tips_close.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/mw_start41.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/mw_start42.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/mw_start51.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/mw_start52.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/mw_start53.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/nim_bg_message_red_package.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/nim_ic_red_package.webp delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/shape_trans_radius_10.xml delete mode 100644 app/src/module_mini_world/res/drawable-xhdpi/shape_white_radius_22.xml delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/ic_mini_world_team.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/ic_mw_creator.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/icon_guide_to_add_world_tips.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/mw_start41.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/mw_start42.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/mw_start51.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/mw_start52.webp delete mode 100644 app/src/module_mini_world/res/drawable-xxhdpi/mw_start53.webp delete mode 100644 app/src/module_mini_world/res/drawable/bg_appcolor_333_0_275.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_audio_party_dialog.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_audio_party_list_dialog.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_item_join_audio_party.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_item_join_audio_party_owner.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_layer.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_choose_classify.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_choose_classify_item.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_cover_default.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_save_button.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_save_button_enable.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_save_button_normal.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_edit_world_edit.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_guest_page_bottom_button.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_guest_page_dialog.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_guest_page_dialog_button.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_guest_page_dialog_button_yellow.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_guest_page_invite_button.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_guest_page_notice.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_member_list_search_bar.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mini_world_member_list_search_button.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mwg_theme.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mwg_theme_able.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_mwg_theme_unable.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_theme_random.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_theme_save.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_un_read_team_message.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_water_drop_other.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_water_drop_owner.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_water_drop_self.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_while_circle.xml delete mode 100644 app/src/module_mini_world/res/drawable/bg_white_333_0_275.xml delete mode 100644 app/src/module_mini_world/res/drawable/drawable_mini_world_member_list_online.xml delete mode 100644 app/src/module_mini_world/res/drawable/rb_mini_world_edit_permission_icon.xml delete mode 100644 app/src/module_mini_world/res/drawable/selector_mw_img_click.xml delete mode 100644 app/src/module_mini_world/res/drawable/shape_bg_nimi_world_search_item.xml delete mode 100644 app/src/module_mini_world/res/layout/act_mini_world_group_message.xml delete mode 100644 app/src/module_mini_world/res/layout/act_mini_world_group_theme.xml delete mode 100644 app/src/module_mini_world/res/layout/act_mw_room_group_message.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_all_topic.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_mini_world.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_mini_world_edit.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_mini_world_main.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_mini_world_search.xml delete mode 100644 app/src/module_mini_world/res/layout/activity_topic_main.xml delete mode 100644 app/src/module_mini_world/res/layout/dialog_audio_party.xml delete mode 100644 app/src/module_mini_world/res/layout/dialog_mini_world_edit_choose_classify.xml delete mode 100644 app/src/module_mini_world/res/layout/dialog_mini_world_guest_page_complete_operation.xml delete mode 100644 app/src/module_mini_world/res/layout/dialog_mini_world_guest_page_invite.xml delete mode 100644 app/src/module_mini_world/res/layout/dialog_mw_comfirm.xml delete mode 100644 app/src/module_mini_world/res/layout/dialog_mw_join_succee.xml delete mode 100644 app/src/module_mini_world/res/layout/fragment_mini_world_category.xml delete mode 100644 app/src/module_mini_world/res/layout/fragment_mini_world_category_my_empty.xml delete mode 100644 app/src/module_mini_world/res/layout/frg_mini_world_notice.xml delete mode 100644 app/src/module_mini_world/res/layout/item_all_topic_list.xml delete mode 100644 app/src/module_mini_world/res/layout/item_audio_party.xml delete mode 100644 app/src/module_mini_world/res/layout/item_guest_audio_party.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_edit_choose_classify.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_list.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_main_bottom_padding.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_main_divider.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_main_find.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_main_item.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_main_title.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_member_avatar.xml delete mode 100644 app/src/module_mini_world/res/layout/item_mini_world_member_list.xml delete mode 100644 app/src/module_mini_world/res/layout/item_out_mw_owner.xml delete mode 100644 app/src/module_mini_world/res/layout/item_recommend_topic_list.xml delete mode 100644 app/src/module_mini_world/res/layout/layout_audio_empty.xml delete mode 100644 app/src/module_mini_world/res/layout/layout_mini_world_main_banner_header.xml delete mode 100644 app/src/module_mini_world/res/layout/layout_mini_world_main_guide.xml delete mode 100644 app/src/module_mini_world/res/layout/layout_start_mw_team_message.xml delete mode 100644 app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml delete mode 100644 app/src/module_mini_world/res/layout/menu_mini_world_guest_page_member.xml delete mode 100644 app/src/module_mini_world/res/layout/menu_mini_world_guest_page_member_no_chat_room.xml delete mode 100644 app/src/module_mini_world/res/layout/menu_mini_world_guest_page_originator.xml delete mode 100644 app/src/module_mini_world/res/layout/menu_mini_world_guest_page_originator_no_chat_room.xml delete mode 100644 app/src/module_mini_world/res/layout/menu_mini_world_guest_page_stranger.xml delete mode 100644 app/src/module_mini_world/res/values/colors.xml delete mode 100644 app/src/module_mini_world/res/values/strings.xml delete mode 100644 app/src/module_mini_world/res/values/styles.xml diff --git a/app/build.gradle b/app/build.gradle index 48176cc74..fe393d22a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,9 +22,9 @@ android { buildConfigField "boolean", "ISOLATION_MODE", "$isolationMode" if (isolationMode) { - resValue "string", "app_name", "Hi-debug" + resValue "string", "app_name", "Mo-debug" } else { - resValue "string", "app_name", "Hiyoo" + resValue "string", "app_name", "Mo" } } @@ -81,26 +81,26 @@ android { enabled = true } - signingConfigs { - - debug { - storeFile file('../app_debug.jks') - storePassword "debug2024" - keyAlias "debug" - keyPassword "debug2024" - v2SigningEnabled true - v1SigningEnabled true - } - - release { - storeFile file('../app_release.jks') - storePassword "xxxx" - keyAlias "xxx" - keyPassword "xxxx" - v2SigningEnabled true - v1SigningEnabled true - } - } +// signingConfigs { +// +// debug { +// storeFile file('../app_debug.jks') +// storePassword "debug2024" +// keyAlias "debug" +// keyPassword "debug2024" +// v2SigningEnabled true +// v1SigningEnabled true +// } +// +// release { +// storeFile file('../app_release.jks') +// storePassword "xxxx" +// keyAlias "xxx" +// keyPassword "xxxx" +// v2SigningEnabled true +// v1SigningEnabled true +// } +// } sourceSets { @@ -114,12 +114,10 @@ android { 'src/module_room_chat/java', 'src/model_customer_server/java', 'src/module_music/java', - 'src/module_mini_world/java', 'src/module_lottery_dialog/java', 'src/module_bank_card/java', 'src/module_super_admin/java', 'src/module_treasure_box/java', - 'src/module_community/java', 'src/module_album/java', ] @@ -134,12 +132,10 @@ android { 'src/module_room_chat/res', 'src/model_customer_server/res', 'src/module_music/res', - 'src/module_mini_world/res', 'src/module_lottery_dialog/res', 'src/module_bank_card/res', 'src/module_super_admin/res', 'src/module_treasure_box/res', - 'src/module_community/res', 'src/module_album/res', ] @@ -165,7 +161,7 @@ android { minifyEnabled minify_enabled.toBoolean() // 是否混淆 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' crunchPngs false // 停用 PNG 压缩 - signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release +// signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release gradle.taskGraph.whenReady { tasks.each { task -> if (task.name.contains("Test") || task.name.contains("Lint")) { @@ -191,7 +187,7 @@ android { shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件 zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列 crunchPngs true // 启用 PNG 压缩 - signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release +// signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index 0d473b009..5f921e243 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -47,8 +47,6 @@ import com.chwl.app.avroom.activity.AVRoomActivity; import com.chwl.app.base.BaseMvpActivity; import com.chwl.app.common.widget.CircleImageView; import com.chwl.app.common.widget.DragLayout; -import com.chwl.app.community.dynamic.view.DynamicDetailActivity; -import com.chwl.app.community.publish.view.PublishActivity; import com.chwl.app.family.view.activity.FamilyHomeActivity; import com.chwl.app.home.HomeViewModel; import com.chwl.app.home.dialog.NewUserHelloDialog; @@ -60,7 +58,6 @@ import com.chwl.app.home.presenter.MainPresenter; import com.chwl.app.home.view.IMainView; import com.chwl.app.home.widget.AnchorCardView; import com.chwl.app.main.helper.NoticationsUiHelper; -import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity; import com.chwl.app.module.Extras; import com.chwl.app.module_hall.secretcode.PwdCodeMgr; import com.chwl.app.service.DaemonService; @@ -203,12 +200,12 @@ public class MainActivity extends BaseMvpActivity FamilyHomeActivity.start(context, linkedInfo.getFamilyId()); } else if (!TextUtils.isEmpty(linkedInfo.getUrl()) && linkedInfo.getType().equals("3")) { CommonWebViewActivity.start(context, UriProvider.getLinkUrl(linkedInfo.getUrl())); - } else if (!TextUtils.isEmpty(linkedInfo.getWorldId()) && linkedInfo.getType().equals("5")) { - MiniWorldGuestPageActivity.start(context, linkedInfo.getWorldId()); - } else if (linkedInfo.getType().equals("6") && !TextUtils.isEmpty(linkedInfo.getWorldId()) && - !TextUtils.isEmpty(linkedInfo.getDynamicId())) { - DynamicDetailActivity.start(context, JavaUtil.str2long(linkedInfo.getDynamicId()), - JavaUtil.str2long(linkedInfo.getWorldId()), 6); +// } else if (!TextUtils.isEmpty(linkedInfo.getWorldId()) && linkedInfo.getType().equals("5")) { +// MiniWorldGuestPageActivity.start(context, linkedInfo.getWorldId()); +// } else if (linkedInfo.getType().equals("6") && !TextUtils.isEmpty(linkedInfo.getWorldId()) && +// !TextUtils.isEmpty(linkedInfo.getDynamicId())) { +// DynamicDetailActivity.start(context, JavaUtil.str2long(linkedInfo.getDynamicId()), +// JavaUtil.str2long(linkedInfo.getWorldId()), 6); } else if (linkedInfo.getType().equals("7") && !TextUtils.isEmpty(linkedInfo.getUid())) { NimP2PMessageActivity.start(context, linkedInfo.getUid()); } else { @@ -854,9 +851,6 @@ public class MainActivity extends BaseMvpActivity @Subscribe(threadMode = ThreadMode.MAIN) public void SquarePublish(SquareTaskEvent event) { - if (getDialogManager() != null) { - PublishActivity.start(getDialogManager()); - } } private void handlePmExitRoom() { diff --git a/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt index e51a00929..1b3578011 100644 --- a/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt @@ -13,14 +13,14 @@ import com.chad.library.adapter.base.diff.BaseQuickDiffCallback import com.chwl.app.R import com.chwl.app.avroom.bean.RoomAlbumPhotoInfo import com.chwl.app.base.BaseViewBindingFragment -import com.chwl.app.community.photo.BigPhotoActivity -import com.chwl.app.community.photo.PagerOption -import com.chwl.app.community.utils.ObjectTypeHelper import com.chwl.app.databinding.FragmentRoomAlbumBinding +import com.chwl.app.photo.BigPhotoActivity +import com.chwl.app.photo.PagerOption import com.chwl.app.ui.utils.ImageLoadUtils import com.chwl.app.ui.utils.ImageLoadUtilsV2 import com.chwl.app.ui.widget.ButtonItem import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.app.utils.ObjectTypeHelper import com.chwl.core.Constants class RoomAlbumFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java index 237dbc2c6..51a309ee1 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java @@ -56,6 +56,9 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; import com.bumptech.glide.request.target.Target; +import com.chwl.app.photo.BigPhotoActivity; +import com.chwl.app.photo.PagerOption; +import com.chwl.app.utils.ObjectTypeHelper; import com.chwl.core.monsterhunting.bean.MonsterDataBean; import com.chwl.core.utils.extension.StringExtensionKt; import com.netease.nim.uikit.business.uinfo.UserInfoHelper; @@ -79,9 +82,6 @@ import com.chwl.library.common.util.Utils; import com.chwl.app.common.widget.CustomAutoWidthImageSpan; import com.chwl.app.common.widget.CustomImageSpan; import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; -import com.chwl.app.community.photo.BigPhotoActivity; -import com.chwl.app.community.photo.PagerOption; -import com.chwl.app.community.utils.ObjectTypeHelper; import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.app.ui.utils.ImageLoadUtilsV2; import com.chwl.app.ui.widget.DividerItemDecoration; diff --git a/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java deleted file mode 100644 index c8f5b78a1..000000000 --- a/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.chwl.app.common.widget.dialog; - -import android.app.Activity; -import android.app.Dialog; -import android.content.Context; -import android.os.Bundle; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.widget.FrameLayout; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatDialogFragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.chwl.app.R; -import com.chwl.app.community.publish.view.WorldsChooseFrg; -import com.chwl.app.home.adapter.FragmentViewPagerAdapter; -import com.chwl.app.ui.widget.magicindicator.MagicIndicator; -import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; -import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.chwl.core.Constants; -import com.chwl.core.community.bean.MiniWorldChooseInfo; -import com.chwl.core.home.bean.TabInfo; -import com.chwl.library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; - -public class ChooseWorldsDialog extends AppCompatDialogFragment - implements ChooseWorldsIndicatorAdapter.OnItemSelectListener, WorldsChooseFrg.ChooseWorldCallback { - - private Context context; - private ViewGroup mRootView; - - private FrameLayout flTopButton; - private FrameLayout flDialogWorld; - private MagicIndicator indicator; - private ViewPager viewPager; - - public static ChooseWorldsDialog newInstance(byte type) { - ChooseWorldsDialog chooseWorldsDialog = new ChooseWorldsDialog(); - Bundle bundle = new Bundle(); - bundle.putByte("type", type); - chooseWorldsDialog.setArguments(bundle); - return chooseWorldsDialog; - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - - context = getContext(); - mRootView = (ViewGroup) View.inflate(getContext(), R.layout.layout_choose_worlds, null); - flTopButton = mRootView.findViewById(R.id.fl_top_button); - flTopButton.setOnClickListener(v -> { - dismissDialog(); - }); - flDialogWorld = mRootView.findViewById(R.id.fl_dialog_world); - flDialogWorld.setOnClickListener(v -> { - dismissDialog(); - }); - indicator = mRootView.findViewById(R.id.indicator); - viewPager = mRootView.findViewById(R.id.viewpager); - - List mTabInfoList = new ArrayList<>(); -// mTabInfoList.add(new TabInfo(1, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_01))); -// mTabInfoList.add(new TabInfo(2, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_02))); - mTabInfoList.add(new TabInfo(3, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_03))); - - List mTabs = new ArrayList<>(); -// mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_JOINED).setmChooseWorldCallback(this)); -// mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_RECOMMEND).setmChooseWorldCallback(this)); - mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_ALL).setmChooseWorldCallback(this)); - - ChooseWorldsIndicatorAdapter topMagicIndicatorAdapter = new ChooseWorldsIndicatorAdapter(context, mTabInfoList, 0); - topMagicIndicatorAdapter.setOnItemSelectListener(this); - CommonNavigator commonNavigator = new CommonNavigator(getContext()); - commonNavigator.setAdjustMode(true); - commonNavigator.setAdapter(topMagicIndicatorAdapter); - indicator.setNavigator(commonNavigator); - - viewPager.setAdapter(new FragmentViewPagerAdapter(getChildFragmentManager(), mTabs)); - ViewPagerHelper.bind(indicator, viewPager); - - Bundle bundle = getArguments(); - byte type; - if (bundle != null) { - type = bundle.getByte("type", Constants.TYPE_JOINED); - } else { - type = Constants.TYPE_JOINED; - } - -// switch (type) { -// case Constants.TYPE_ALL: - viewPager.setCurrentItem(2); -// break; -// -// case Constants.TYPE_JOINED: -// viewPager.setCurrentItem(0); -// break; -// -// case Constants.TYPE_RECOMMEND: -// viewPager.setCurrentItem(1); -// break; -// } - - return mRootView; - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - if (getActivity() != null) { - Dialog dialog = new Dialog(getActivity(), R.style.room_rank_dialog); - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(R.layout.layout_choose_worlds); - dialog.setCanceledOnTouchOutside(true); - - // 设置弹出框布局参数，宽度铺满全屏，底部。 - Window window = dialog.getWindow(); - if (window != null) { - WindowManager.LayoutParams wlp = window.getAttributes(); - wlp.gravity = Gravity.BOTTOM; - wlp.width = WindowManager.LayoutParams.MATCH_PARENT; - wlp.height = ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(context); - window.setDimAmount(0.3f); - window.setAttributes(wlp); - window.setBackgroundDrawableResource(R.drawable.bg_audio_party_list_dialog); - window.setWindowAnimations(R.style.ErbanCommonWindowAnimationStyle); - return dialog; - } else { - return super.onCreateDialog(savedInstanceState); - } - } else { - return super.onCreateDialog(savedInstanceState); - } - } - - @Override - public void onItemSelect(int position) { - viewPager.setCurrentItem(position); - } - - private WorldsChooseFrg.ChooseWorldCallback mChooseWorldCallback; - @Override - public void callback(MiniWorldChooseInfo miniWorldChooseInfo) { - if (mChooseWorldCallback != null) { - mChooseWorldCallback.callback(miniWorldChooseInfo); - } - - mChooseWorldCallback = null; - dismissDialog(); - } - - public void setmChooseWorldCallback(WorldsChooseFrg.ChooseWorldCallback chooseWorldCallback) { - this.mChooseWorldCallback = chooseWorldCallback; - } - - public void dismissDialog() { - //注释这个判断，因为不保留活动情况下，((Activity)mContext).isDestroyed() 为true 导致不执行dismiss一个dialog - //而mDialog.getWindow()不为null，还是可以dismiss一个dialog的。 -// if(!checkActivityValid()) -// return; - //加上一个try，强行吞异常 - try { - Context context = getContext(); - if (getContext() != null) { - if (context instanceof Activity) { - Activity activity = (Activity) context; - if (!activity.isFinishing())//如果dialog在延时比如handler。postDelay中调用,而activity.已经destory,会报异常java.lang.IllegalArgumentException: View not attached to window manager - dismiss(); - } else - dismiss(); - } - } catch (Exception e){ - - } - } -} diff --git a/app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java b/app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java index eba2ba06f..319ccb2eb 100644 --- a/app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java +++ b/app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java @@ -14,7 +14,6 @@ import com.netease.nim.uikit.StatusBarUtil; import com.chwl.app.R; import com.chwl.app.base.BaseMvpActivity; import com.chwl.app.base.TitleBar; -import com.chwl.app.community.dynamic.view.DynamicDetailActivity; import com.chwl.app.home.adapter.CommunityNoticeAdapter; import com.chwl.app.home.presenter.CommunityNoticePresenter; import com.chwl.app.home.view.ICommunityNoticeAct; @@ -59,23 +58,6 @@ public class CommunityNoticeAct extends BaseMvpActivity getMvpPresenter().loadMore(AuthModel.get().getCurrentUid()), recyclerView); mCommunityNoticeAdapter.setOnItemChildClickListener((adapter, view, position) -> { - List list = adapter.getData(); - if (list.size() > 0 && position < list.size()) { - CommunityNoticeInfo info = list.get(position); - - if (info != null) { - switch (view.getId()) { - case R.id.cl_community_notice_list: - DynamicDetailActivity.start(CommunityNoticeAct.this, info.getDynamicId(), info.getWorldId(), 4); - break; - - case R.id.civ_avatar_community_notice_list: - UserInfoActivity.Companion.start(context, info.getUid()); - break; - } - - } - } }); recyclerView.setAdapter(mCommunityNoticeAdapter); recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); diff --git a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt index 6e6d8e41b..fde1fb96d 100644 --- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt @@ -20,7 +20,6 @@ import com.netease.nim.uikit.StatusBarUtil import com.chwl.app.R import com.chwl.app.base.BaseViewBindingActivity import com.chwl.app.databinding.ActivityGiveGoldToUserBinding -import com.chwl.app.miniworld.listener.DoubleClickCheckListener import com.chwl.app.pay.GiveGoldModel import com.chwl.app.pay.adapter.GiveGiftAdapter import com.chwl.app.pay.password.GiveGoldPassWordFragment @@ -32,6 +31,7 @@ import com.chwl.app.ui.widget.dialog.CommonTipDialog import com.chwl.app.ui.widget.dialog.GiveDiamondTipDialog import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.app.utils.DoubleClickCheckListener import com.chwl.core.DemoCache import com.chwl.core.gift.GiftModel import com.chwl.core.gift.bean.GiftInfo diff --git a/app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java b/app/src/main/java/com/chwl/app/photo/BigPagerAdapter.java similarity index 98% rename from app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java rename to app/src/main/java/com/chwl/app/photo/BigPagerAdapter.java index 4699c1b90..5cea5d08f 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/photo/BigPagerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chwl.app.community.photo; +package com.chwl.app.photo; import android.view.ViewGroup; diff --git a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java b/app/src/main/java/com/chwl/app/photo/BigPhotoActivity.java similarity index 99% rename from app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java rename to app/src/main/java/com/chwl/app/photo/BigPhotoActivity.java index 0d40d877b..19349a266 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java +++ b/app/src/main/java/com/chwl/app/photo/BigPhotoActivity.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.photo; +package com.chwl.app.photo; import android.Manifest; import android.annotation.SuppressLint; @@ -6,7 +6,6 @@ import android.app.Activity; import android.content.Intent; import android.view.View; -import com.netease.nim.uikit.common.util.log.LogUtil; import com.chwl.app.R; import com.chwl.app.base.BaseViewBindingActivity; import com.chwl.app.databinding.ActivityBigPhotoBinding; @@ -16,6 +15,7 @@ import com.chwl.library.common.util.AlbumUtils; import com.chwl.library.common.util.ExecutorCenter; import com.chwl.library.utils.ResUtil; import com.example.matisse.internal.entity.CustomItem; +import com.netease.nim.uikit.common.util.log.LogUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java b/app/src/main/java/com/chwl/app/photo/BigPhotoItemFragment.java similarity index 99% rename from app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java rename to app/src/main/java/com/chwl/app/photo/BigPhotoItemFragment.java index 4424ee4f1..e9ec3424b 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java +++ b/app/src/main/java/com/chwl/app/photo/BigPhotoItemFragment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chwl.app.community.photo; +package com.chwl.app.photo; import android.app.Activity; import android.content.Context; @@ -26,13 +26,13 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.bumptech.glide.request.RequestOptions; -import com.netease.nim.uikit.support.glide.GlideApp; import com.chwl.app.R; import com.chwl.app.ui.utils.ImageLoadUtilsV2; import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; import com.chwl.library.utils.LogUtil; import com.chwl.library.utils.ResUtil; import com.example.matisse.internal.entity.CustomItem; +import com.netease.nim.uikit.support.glide.GlideApp; import it.sephiroth.android.library.imagezoom.ImageViewTouch; import it.sephiroth.android.library.imagezoom.ImageViewTouchBase; diff --git a/app/src/module_community/java/com/chwl/app/community/photo/OnFragmentOptionListener.java b/app/src/main/java/com/chwl/app/photo/OnFragmentOptionListener.java similarity index 80% rename from app/src/module_community/java/com/chwl/app/community/photo/OnFragmentOptionListener.java rename to app/src/main/java/com/chwl/app/photo/OnFragmentOptionListener.java index f254f8a34..754d547bc 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/OnFragmentOptionListener.java +++ b/app/src/main/java/com/chwl/app/photo/OnFragmentOptionListener.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.photo; +package com.chwl.app.photo; /** * create by lvzebiao @2019/11/20 diff --git a/app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java b/app/src/main/java/com/chwl/app/photo/PagerOption.java similarity index 96% rename from app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java rename to app/src/main/java/com/chwl/app/photo/PagerOption.java index 7c6184d4d..31d723c5c 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java +++ b/app/src/main/java/com/chwl/app/photo/PagerOption.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.photo; +package com.chwl.app.photo; import com.example.matisse.internal.entity.CustomItem; diff --git a/app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java b/app/src/main/java/com/chwl/app/photo/PhotoAdapter.java similarity index 97% rename from app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java rename to app/src/main/java/com/chwl/app/photo/PhotoAdapter.java index 3349d3d8d..170a73901 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java +++ b/app/src/main/java/com/chwl/app/photo/PhotoAdapter.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.photo; +package com.chwl.app.photo; import android.content.Context; import android.content.Intent; @@ -14,10 +14,8 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; import com.chwl.app.R; import com.chwl.app.common.widget.dialog.DialogManager; -import com.chwl.app.community.widget.ZoomImageView; import com.chwl.app.ui.utils.ImageLoadUtilsV2; import com.chwl.app.ui.widget.ButtonItem; import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; @@ -25,6 +23,7 @@ import com.chwl.library.utils.ResUtil; import com.chwl.library.utils.SingleToastUtil; import com.chwl.library.utils.file.JXFileUtils; import com.example.matisse.internal.entity.CustomItem; +import com.netease.nim.uikit.support.glide.GlideApp; import java.io.File; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java b/app/src/main/java/com/chwl/app/photo/PreviewPhotoActivity.java similarity index 97% rename from app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java rename to app/src/main/java/com/chwl/app/photo/PreviewPhotoActivity.java index a90eaf82e..6c70246ba 100644 --- a/app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java +++ b/app/src/main/java/com/chwl/app/photo/PreviewPhotoActivity.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.photo; +package com.chwl.app.photo; import android.app.Activity; import android.content.Context; @@ -9,11 +9,11 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; -import com.netease.nim.uikit.common.util.log.LogUtil; import com.chwl.app.R; import com.chwl.app.base.BaseActivity; -import com.chwl.app.community.utils.ObjectTypeHelper; +import com.chwl.app.utils.ObjectTypeHelper; import com.example.matisse.internal.entity.CustomItem; +import com.netease.nim.uikit.common.util.log.LogUtil; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/chwl/app/community/widget/ZoomImageView.java b/app/src/main/java/com/chwl/app/photo/ZoomImageView.java similarity index 99% rename from app/src/module_community/java/com/chwl/app/community/widget/ZoomImageView.java rename to app/src/main/java/com/chwl/app/photo/ZoomImageView.java index 40cbf8bca..9a11147e2 100644 --- a/app/src/module_community/java/com/chwl/app/community/widget/ZoomImageView.java +++ b/app/src/main/java/com/chwl/app/photo/ZoomImageView.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.widget; +package com.chwl.app.photo; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java b/app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java index de9d10578..dc58aed82 100644 --- a/app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java +++ b/app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java @@ -9,8 +9,6 @@ import com.netease.nim.uikit.api.model.session.SessionEventListener; import com.netease.nim.uikit.business.session.actions.BaseAction; import com.netease.nim.uikit.business.session.actions.ImageAction; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.chwl.app.community.holder.DynamicSysHolder; -import com.chwl.app.community.im.WorldDynamicShareViewHolder; import com.chwl.app.luckymoney.viewholder.LuckyMoneyMsgViewHolder; import com.chwl.app.luckymoney.viewholder.LuckyMoneyTipsViewHolder; import com.chwl.app.module_hall.HallDataManager; @@ -29,7 +27,6 @@ import com.chwl.app.ui.im.chat.MsgViewHolderLevel; import com.chwl.app.ui.im.chat.MsgViewHolderLottery; import com.chwl.app.ui.im.chat.MsgViewHolderOnline; import com.chwl.app.ui.im.chat.MsgViewHolderP2PContactRecharge; -import com.chwl.app.ui.im.chat.MsgViewHolderRedPackage; import com.chwl.app.ui.im.chat.MsgViewHolderRedPacket; import com.chwl.app.ui.im.chat.MsgViewHolderSkill; import com.chwl.app.ui.im.chat.MsgViewHolderText; @@ -37,8 +34,6 @@ import com.chwl.app.ui.im.chat.SignInNoticeMsgViewHolder; import com.chwl.app.ui.im.chat.SysMsgV2ViewHolder; import com.chwl.app.ui.im.chat.SysMsgViewHolder; import com.chwl.app.ui.user.activity.UserInfoActivity; -import com.chwl.core.community.attachment.DynamicSysAttachment; -import com.chwl.core.community.im.WorldDynamicAttachment; import com.chwl.core.im.custom.bean.AssistantAttachment; import com.chwl.core.im.custom.bean.CarAttachment; import com.chwl.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; @@ -149,7 +144,6 @@ public class ImInitHelper { NimUIKit.registerMsgItemViewHolder(SysMsgV2Attachment.class, SysMsgV2ViewHolder.class); NimUIKit.registerMsgItemViewHolder(LevelUpAttachment.class, MsgViewHolderLevel.class); NimUIKit.registerMsgItemViewHolder(AitMeAttachment.class, MsgViewHolderAitMe.class); - NimUIKit.registerMsgItemViewHolder(RedPackageAttachment.class, MsgViewHolderRedPackage.class); //模厅模块 HallDataManager.get().mainNimOnCreate(); //公会模块 @@ -159,11 +153,6 @@ public class ImInitHelper { //瓜分钻石 三级 NimUIKit.registerMsgItemViewHolder(CarveUpGoldThirdLevelAttachment.class, MsgViewHolderText.class); - // 社区动态 - NimUIKit.registerMsgItemViewHolder(DynamicSysAttachment.class, DynamicSysHolder.class); // 动态审核, 违规删除 - //世界动态分享 - NimUIKit.registerMsgItemViewHolder(WorldDynamicAttachment.class, WorldDynamicShareViewHolder.class); - NimUIKit.registerMsgItemViewHolder(ChatHintAttachment.class, MsgViewHolderChatHint.class); //技能卡 diff --git a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java index 838f7a02a..e3bd0c35a 100644 --- a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java +++ b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java @@ -22,9 +22,6 @@ import com.chwl.app.fansteam.FansTeamListActivity; import com.chwl.app.home.activity.CollectionRoomActivity; import com.chwl.app.home.activity.VisitorListActivity; import com.chwl.app.home.helper.OpenRoomHelper; -import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity; -import com.chwl.app.miniworld.activity.MiniWorldMainActivity; -import com.chwl.app.miniworld.activity.TopicMainActivity; import com.chwl.app.module_hall.HallDataManager; import com.chwl.app.module_hall.hall.activity.ModuleClanActivity; import com.chwl.app.module_hall.hall.activity.ModuleHallActivity; @@ -246,13 +243,6 @@ public class RouterHandler { break; case RouterType.GAME_MATCHING: break; - case RouterType.MINI_WORLD: - MiniWorldMainActivity.start(context); - break; - case RouterType.MINI_WORLD_DETAIL: - MiniWorldGuestPageActivity.start(context, routerValue); - break; - case RouterType.SQUARE_PUBLISH: EventBus.getDefault().post(new SquareTaskEvent()); break; @@ -327,9 +317,6 @@ public class RouterHandler { case RouterType.MY_SET: UIHelper.showSettingAct(context); break; - case RouterType.TOPIC: - TopicMainActivity.start(context, routerValue); - break; case RouterType.MY_REVENUE: EarnRecordActivity.start(context); break; diff --git a/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java deleted file mode 100644 index 728bc5d51..000000000 --- a/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.chwl.app.ui.im.chat; - -import android.view.View; -import android.widget.TextView; - -import com.coorchice.library.utils.LogUtils; -import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; -import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.chwl.app.R; -import com.chwl.app.avroom.activity.AVRoomActivity; -import com.chwl.app.common.widget.dialog.DialogManager; -import com.chwl.core.DemoCache; -import com.chwl.core.im.custom.bean.RedPackageAttachment; -import com.chwl.core.manager.AvRoomDataManager; -import com.chwl.core.redpackage.bean.RedPackageNotifyInfo; -import com.chwl.core.utils.CurrentTimeUtils; -import com.chwl.library.utils.ResUtil; - -import java.util.Map; - -/** - * Created by zhoujianghua on 2015/8/4. - */ -public class MsgViewHolderRedPackage extends MsgViewHolderBase { - - public MsgViewHolderRedPackage(BaseMultiItemFetchLoadAdapter adapter) { - super(adapter); - } - - private TextView tvNickname; - private TextView tvAll; - private TextView tvTip; - @Deprecated(since = "2.2.0版本，红包失效时间是客户端写死的，以后用消息体内的endTime") - private int halfHour = 60 * 30 * 1000; - - - @Override - protected int getContentResId() { - return R.layout.message_item_red_package; - } - - @Override - protected void inflateContentView() { - tvNickname = findViewById(R.id.tv_nickname); - tvAll = findViewById(R.id.tv_all); - tvTip = findViewById(R.id.tv_tip); - } - - @Override - protected void bindContentView() { - Map map = DemoCache.readRedPackage(); - RedPackageAttachment attachment = (RedPackageAttachment) message.getAttachment(); - RedPackageNotifyInfo notifyInfo = attachment.getRedPackageNotifyInfo(); - String id = notifyInfo.getRedEnvelopeId(); - LogUtils.d("getTime = " + message.getTime()); - if (map != null && map.containsKey(id)) { //已领取 - tvNickname.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_01)); - tvAll.setVisibility(View.GONE); - tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_02)); - contentContainer.setAlpha(0.5f); - } else{ - long endTime; - notifyInfo.getEndTime(); - if (notifyInfo.getEndTime() != null) { - // 2.2.0版本后 新增动态失效时间 - endTime = notifyInfo.getEndTime(); - } else { - // 可能是2.2.0版本前：失效时间固定为30分 - endTime = message.getTime() + halfHour; - } - if (CurrentTimeUtils.getCurrentTime() < endTime) { - tvNickname.setText(notifyInfo.getSendUserNick()); - tvAll.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_03)); - tvAll.setVisibility(View.VISIBLE); - tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_04)); - contentContainer.setAlpha(1f); - DialogManager.OkCancelDialogListener listener = () -> AVRoomActivity.start(context, notifyInfo.getRoomUid(), - AVRoomActivity.FROM_TYPE_ALL_RED, notifyInfo.getSendUserNick(), notifyInfo); - contentContainer.setOnClickListener(v -> { - if (AvRoomDataManager.get().isOwnerOnMic() && AvRoomDataManager.get().getRoomId() != notifyInfo.getRoomUid()) { - new DialogManager(context).showOkCancelDialog(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_05), true, listener); - } else { - listener.onOk(); - } - } - ); - } else { - //已失效 - tvNickname.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_06)); - tvAll.setVisibility(View.GONE); - tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_07)); - contentContainer.setAlpha(0.5f); - } - } - } - - - @Override - protected void onItemClick() { - - } - - - protected int leftBackground() { - return 0; - } - - protected int rightBackground() { - return 0; - } -} diff --git a/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java index ce753ac94..efc5ef300 100644 --- a/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java @@ -27,7 +27,6 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.chwl.app.R; -import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity; import com.chwl.app.sys.ErbanSysMsgViewModel; import com.chwl.app.ui.im.RouterHandler; import com.chwl.core.im.custom.bean.SysMsgAttachment; @@ -274,7 +273,6 @@ public class SysMsgViewHolder extends MsgViewHolderBase implements View.OnClickL if (map != null) { String worldId = map.get("worldId"); if (!TextUtils.isEmpty(worldId)) { - MiniWorldGuestPageActivity.start(context, worldId); } } } diff --git a/app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java b/app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java index a3f99e470..607d26aa4 100644 --- a/app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java @@ -23,16 +23,11 @@ import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.model.Team; import com.trello.rxlifecycle3.android.FragmentEvent; import com.chwl.app.R; -import com.chwl.app.avroom.activity.AVRoomActivity; import com.chwl.app.base.BaseFragment; -import com.chwl.app.miniworld.activity.MWTeamRoomMessageAct; -import com.chwl.app.miniworld.activity.MiniWorldTeamMessageActivity; import com.chwl.app.module_hall.im.NimHelper; import com.chwl.app.module_hall.team.activity.HallTeamMessageActivity; import com.chwl.app.team.view.NimTeamMessageActivity; import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; -import com.chwl.app.ui.im.recent.adapter.AttentionInRoomAdapter; -import com.chwl.app.ui.relation.AttentionListActivity; import com.chwl.app.mentoring_relationship.adapter.GrabApprenticesAdapter; import com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity; import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity; @@ -279,20 +274,6 @@ public class RecentListFragment extends BaseFragment { } else { HallTeamMessageActivity.start(mContext, recent.getContactId()); } - } else if (type == 2) { - - if (isInRoom) { - MWTeamRoomMessageAct.start(mContext, recent.getContactId()); - } else { - Team t = NimUIKit.getTeamProvider().getTeamById(recent.getContactId()); - if (t != null && t.isMyTeam()) { - MiniWorldTeamMessageActivity.start(mContext, recent.getContactId(), true); - } else { - MiniWorldTeamMessageActivity.start(mContext, recent.getContactId(), false); - } - - } - } else { toast(ResUtil.getString(R.string.im_recent_recentlistfragment_05)); } diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java deleted file mode 100644 index 9cb57d52a..000000000 --- a/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.chwl.app.ui.user.adapter; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.text.TextUtils; -import android.view.View; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.chwl.app.BR; -import com.chwl.app.R; -import com.chwl.app.UIHelper; -import com.chwl.app.audio.widget.VoiceLine; -import com.chwl.app.bindadapter.BaseAdapter; -import com.chwl.app.miniworld.activity.TopicMainActivity; -import com.chwl.app.ui.user.activity.ShowPhotoActivity; -import com.chwl.app.ui.widget.SquareImageView; -import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.chwl.core.auth.AuthModel; -import com.chwl.core.bean.UserInfoItem; -import com.chwl.core.family.bean.FamilyInfo; -import com.chwl.core.module_hall.hall.bean.HTeamInfo; -import com.chwl.core.module_hall.hall.bean.OwnerHallInfo; -import com.chwl.core.user.bean.JoinWorldInfo; -import com.chwl.core.user.bean.UserGameInfo; -import com.chwl.core.user.bean.UserInfo; -import com.chwl.core.user.bean.UserPhoto; -import com.chwl.core.utils.StringFormatUtils; -import com.chwl.library.utils.ListUtils; -import com.chwl.library.utils.ResUtil; -import com.chwl.library.utils.SizeUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -public class UserDesAdapter extends UserTabBaseAdapter implements UserPhotoAdapter.ImageClickListener { - public void setUserId(long userId) { - this.userId = userId; - } - - private long userId = 0; - private UserInfo userInfo; - private boolean isPlaying = false; - - public UserDesAdapter(Context context, List data) { - super(context, data); - - addItemType(UserInfoItem.TYPE_DES_PHOTO, R.layout.layout_des_photo); - addItemType(UserInfoItem.TYPE_DES_PERSONAL, R.layout.layout_des_personal); - addItemType(UserInfoItem.TYPE_DES_VOICE, R.layout.layout_desc_voice); - addItemType(UserInfoItem.TYPE_DES_FAMILY, R.layout.layout_user_family); - addItemType(UserInfoItem.TYPE_DES_HALL, R.layout.include_user_module_hall); - addItemType(UserInfoItem.TYPE_DES_GAME, R.layout.layout_desc_game); - addItemType(UserInfoItem.TYPE_DES_JOIN_WORLDS, R.layout.layout_user_join_worlds); - } - - public void setPlaying(boolean playing) { - isPlaying = playing; - } - - @Override - protected void convert(BaseViewHolder helper, UserInfoItem item) { - if (item == null) - return; - - super.convert(helper, item); - - switch (item.getItemType()) { - case UserInfoItem.TYPE_DES_PHOTO: - setPhoto(helper); - break; - - case UserInfoItem.TYPE_DES_PERSONAL: - setPersonal(helper); - break; - - case UserInfoItem.TYPE_DES_VOICE: - setVoice(helper); - break; - - case UserInfoItem.TYPE_DES_FAMILY: - setFamily(helper, item); - break; - - case UserInfoItem.TYPE_DES_HALL: - setHall(helper, item); - break; - - case UserInfoItem.TYPE_DES_GAME: - setGame(helper, item); - break; - - case UserInfoItem.TYPE_DES_JOIN_WORLDS: - setJoinWorlds(helper, item); - break; - } - - - } - - private LinearLayoutManager gameManager; - - private void setGame(BaseViewHolder helper, UserInfoItem item) { - if (item == null) - return; - - ArrayList list = (ArrayList) item.getData(); - - if (ListUtils.isListEmpty(list)) { - helper.setGone(R.id.tv_game, false); - helper.setGone(R.id.rv_game, false); - - } else { - helper.setGone(R.id.tv_game, true); - helper.setGone(R.id.rv_game, true); - - RecyclerView rvGame = helper.itemView.findViewById(R.id.rv_game); - - if (gameManager == null) - gameManager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false); - rvGame.setLayoutManager(gameManager); - - BaseAdapter adapter = new BaseAdapter(R.layout.item_user_game, BR.gameInfo); - rvGame.setAdapter(adapter); - adapter.setNewData(list); - } - } - - // 没有模厅不需要展示 - private void setHall(BaseViewHolder helper, UserInfoItem item) { - if (item == null) - return; - - OwnerHallInfo ownerHallInfo = (OwnerHallInfo) item.getData(); - if (ownerHallInfo == null) { - helper.setGone(R.id.ll_hall_layout, false); - - } else { - - //说明该客态页是厅成员或者没有厅 - if (ownerHallInfo.getHallId() <= 0) { - helper.setGone(R.id.ll_hall_layout, false); - } else { - helper.setGone(R.id.ll_hall_layout, true); - helper.setGone(R.id.stv_apply_hall, false); - - helper.setText(R.id.tv_hall_name, ownerHallInfo.getHallName()); - //如果不是自己，并且不在厅里，才显示申请按钮 - if (!ownerHallInfo.isInHall()) { - helper.setGone(R.id.stv_apply_hall, true); - helper.addOnClickListener(R.id.stv_apply_hall); - } - - if (ownerHallInfo.isHasPublicChat()) { - helper.setGone(R.id.rl_hall_team_layout, true); - helper.addOnClickListener(R.id.rl_hall_team_layout); - - helper.setGone(R.id.stv_apply_team, false); - HTeamInfo publicTeam = ownerHallInfo.getPublicChat(); - if (publicTeam != null) { - helper.setText(R.id.tv_public_team_name, publicTeam.getName()); - if (!publicTeam.isInChat()) { - helper.setGone(R.id.stv_apply_team, true); - helper.addOnClickListener(R.id.stv_apply_team); - } - } - } else { - helper.setGone(R.id.rl_hall_team_layout, false); - } - - } - - } - - } - - // 没有家族不需要展示 - private void setFamily(BaseViewHolder helper, UserInfoItem item) { - - if (item == null) - return; - - FamilyInfo familyInfo = (FamilyInfo) item.getData(); - if (familyInfo == null) { - helper.setGone(R.id.ll_my_family_container, false); - return; - } - helper.setGone(R.id.ll_my_family_container, true); - - SquareImageView ivFamilyCover = helper.itemView.findViewById(R.id.iv_family_cover); - GlideApp.with(mContext) - .load(familyInfo.getFamilyIcon()) - .dontAnimate() - .placeholder(R.drawable.default_cover) - .transforms(new CenterCrop(), new RoundedCorners(10)) - .error(R.drawable.default_cover) - .into(ivFamilyCover); - - helper.setText(R.id.tv_family_name, familyInfo.getFamilyName()); - helper.setText(R.id.tv_family_id, String.format(mContext.getString(R.string.family_id), familyInfo.getFamilyId())); - helper.setText(R.id.tv_family_member_count, String.format(mContext.getString( - R.string.family_member_count), String.valueOf(familyInfo.getMemberCount()))); - - helper.addOnClickListener(R.id.ll_my_family); - } - - public void setmVoiceDuration(int mVoiceDuration) { - this.mVoiceDuration = mVoiceDuration; - } - - private int mVoiceDuration = 0; - - private void setVoice(BaseViewHolder helper) { - if (userInfo == null) - return; - - if (isOwner()) {// 主态 - helper.setGone(R.id.layout_voice, true); - helper.setGone(R.id.layout_voice_bar, !StringFormatUtils.isEmpty(userInfo.getUserVoice())); - helper.setGone(R.id.layout_voice_bar_no_data, StringFormatUtils.isEmpty(userInfo.getUserVoice())); - helper.setText(R.id.tv_voice_title, ResUtil.getString(R.string.user_adapter_userdesadapter_01)); - helper.setGone(R.id.iv_voice_more, true); - - } else {// 客态 - helper.setGone(R.id.layout_voice, !StringFormatUtils.isEmpty(userInfo.getUserVoice())); - helper.setGone(R.id.layout_voice_bar, !StringFormatUtils.isEmpty(userInfo.getUserVoice())); - helper.setGone(R.id.layout_voice_bar_no_data, false); - helper.setText(R.id.tv_voice_title, ResUtil.getString(R.string.user_adapter_userdesadapter_02)); - helper.setGone(R.id.iv_voice_more, false); - } - - helper.addOnClickListener(R.id.layout_voice_bar); - helper.addOnClickListener(R.id.iv_voice_more); - helper.addOnClickListener(R.id.layout_voice_bar_no_data); - - VoiceLine voiceLine = helper.itemView.findViewById(R.id.layout_voice_line); - if (voiceLine != null) { - voiceLine.stopAnim(); - if (isPlaying) { - helper.setImageResource(R.id.iv_voice_bar_play, R.drawable.ic_voice_bar_pause); - voiceLine.startAnim(); - } else { - helper.setImageResource(R.id.iv_voice_bar_play, R.drawable.ic_voice_bar_play); - voiceLine.stopAnim(); - } - } - -// int duration = mVoiceDuration; -// if (duration == 0) -// duration = userInfo.getVoiceDura(); - helper.setText(R.id.tv_voice_duration, String.format(Locale.getDefault(), "%ds", userInfo.getVoiceDura())); - } - - private void setPersonal(BaseViewHolder helper) { - if (userInfo == null) - return; - - String desc = userInfo.getUserDesc(); - helper.setText(R.id.tv_desc, TextUtils.isEmpty(desc) ? ResUtil.getString(R.string.user_adapter_userdesadapter_03) : desc); - } - - private LinearLayoutManager mPhotoLayoutManager; - - private void setPhoto(BaseViewHolder helper) { - - if (userInfo == null) - return; - - if (mPhotoLayoutManager == null) - mPhotoLayoutManager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false); - - RecyclerView photoRecyclerView = helper.itemView.findViewById(R.id.photo_recyclerView); - photoRecyclerView.setLayoutManager(mPhotoLayoutManager); - - List privatePhoto = userInfo.getPrivatePhoto(); - - if (isOwner()) {// 主态 - helper.setGone(R.id.photo_recyclerView, true); - helper.setGone(R.id.tv_empty_photo, false); - - UserPhotoAdapter photoAdapter = new UserPhotoAdapter(privatePhoto, 0, userInfo.getUid()); - photoRecyclerView.setAdapter(photoAdapter); - photoAdapter.setImageClickListener(this); - - } else { // 客态 - if (ListUtils.isListEmpty(privatePhoto)) { - helper.setGone(R.id.photo_recyclerView, false); - helper.setGone(R.id.tv_empty_photo, true); - - } else { - helper.setGone(R.id.photo_recyclerView, true); - helper.setGone(R.id.tv_empty_photo, false); - UserPhotoAdapter photoAdapter = new UserPhotoAdapter(privatePhoto, 0, userInfo.getUid()); - photoRecyclerView.setAdapter(photoAdapter); - photoAdapter.setImageClickListener(this); - } - } - - } - - public void setUserInfo(UserInfo userInfo) { - this.userInfo = userInfo; - } - - @Override - public void click(int position, UserPhoto userPhoto, boolean isOwner) { - if (isOwner) { - if (position > 0) { - showUserPhoto(position - 1); - } else { - UIHelper.showModifyPhotosAct((Activity) mContext, userId); - } - } else { - //创建一个集合拿来做用户所有照片信息 - showUserPhoto(position); - } - - } - - private void showUserPhoto(int position) { - //创建一个集合拿来做用户所有照片信息 - ArrayList userPhotos = new ArrayList<>(); - List realmList = userInfo.getPrivatePhoto(); - for (UserPhoto photo : realmList) { - UserPhoto newPhoto = new UserPhoto(); - newPhoto.setPid(photo.getPid()); - newPhoto.setPhotoUrl(photo.getPhotoUrl()); - userPhotos.add(newPhoto); - } - Intent intent = new Intent(mContext, ShowPhotoActivity.class); - intent.putExtra("position", position); - intent.putExtra("photoList", userPhotos); - mContext.startActivity(intent); - } - - private boolean isOwner() { - return AuthModel.get().getCurrentUid() == userId && userId != 0; - } - - private byte isInitJoinWorlds = 0; - private void setJoinWorlds(BaseViewHolder baseViewHolder, UserInfoItem item) { - baseViewHolder.setText(R.id.tv_label_user_join_worlds, isOwner() ? ResUtil.getString(R.string.user_adapter_userdesadapter_04) : ResUtil.getString(R.string.user_adapter_userdesadapter_05)); - ArrayList list = (ArrayList) item.getData(); - - if (list != null && list.size() > 0) { - RecyclerView recyclerView = baseViewHolder.getView(R.id.rv_user_join_worlds); - recyclerView.getLayoutManager(); - UserJoinWorldAdapter userJoinWorldAdapter = new UserJoinWorldAdapter(); - userJoinWorldAdapter.setNewData(list); - userJoinWorldAdapter.setOnItemChildClickListener(new OnItemChildClickListener() { - @Override - public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { - List list1 = adapter.getData(); - if (list1.size() > position) { - JoinWorldInfo joinWorldInfo = list1.get(position); - if (joinWorldInfo != null) { - TopicMainActivity.start(mContext, String.valueOf(joinWorldInfo.getWorldId())); - } - } - } - }); - - recyclerView.setAdapter(userJoinWorldAdapter); - if (isInitJoinWorlds == 0) { - recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); - recyclerView.addItemDecoration(new VerticalDecoration(SizeUtils.dp2px(mContext, 15), true, true)); - - isInitJoinWorlds = 1; - } - } - - } -} diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java deleted file mode 100644 index 5b92edefb..000000000 --- a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.chwl.app.ui.user.adapter; - - -import android.app.Activity; -import android.content.Context; -import android.text.TextUtils; -import android.util.SparseBooleanArray; -import android.util.SparseIntArray; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.chwl.app.R; -import com.chwl.app.community.dynamic.view.DynamicDetailActivity; -import com.chwl.app.community.helper.CalcSize; -import com.chwl.app.community.helper.DynamicUiHelper; -import com.chwl.app.community.helper.ImageUiHelper; -import com.chwl.app.community.photo.BigPhotoActivity; -import com.chwl.app.community.photo.DynamicImageAdapter; -import com.chwl.app.community.photo.PagerOption; -import com.chwl.app.community.utils.ObjectTypeHelper; -import com.chwl.app.community.widget.ExpandableTextView; -import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; -import com.chwl.app.utils.TimeUiUtils; -import com.chwl.core.community.bean.DynamicMedia; -import com.chwl.core.community.bean.WorldDynamicBean; -import com.chwl.core.community.dynamic.DynamicModel; -import com.chwl.core.utils.net.DontWarnObserver; -import com.chwl.core.utils.net.RxHelper; -import com.chwl.library.utils.ResUtil; -import com.chwl.library.utils.SingleToastUtil; - -import java.util.List; - -/** - * create by lvzebiao @2019/11/13 - */ -public class UserInfoDynamicAdapter extends BaseQuickAdapter { - - private SparseBooleanArray mCollapsedStatus = new SparseBooleanArray(); - private SparseIntArray mCollapsedHeightStatus = new SparseIntArray(2); - - private Context context; - - private long worldId; - - private int iconWidth; - - private int iconHeight; - - /** - * 单图情况下的边界 - */ - private int imageBorder; - /** - * 图片的边界值 - */ - private int divider; - - - public UserInfoDynamicAdapter(Context context) { - super(R.layout.item_userinfo_dynamic); - this.context = context; - iconWidth = UIUtil.dip2px(context, 32); - iconHeight = UIUtil.dip2px(context, 15); - //0.68 - imageBorder = UIUtil.getScreenWidth(context) * ImageUiHelper.BORDER_MIN / ImageUiHelper.BORDER_MAX; - divider = UIUtil.dip2px(context, 10); - } - - @Override - protected void convert(BaseViewHolder helper, WorldDynamicBean item) { - //这个值，有没有文本UI部分，改变图片部分的margin - boolean noTextUi = TextUtils.isEmpty(item.getContent()); - RecyclerView rvImage = helper.getView(R.id.rv_image); - List dynamicMediaList = item.getDynamicResList(); - if (item.getType() == WorldDynamicBean.TYPE_IMAGE - && dynamicMediaList != null && dynamicMediaList.size() > 0) { - rvImage.setVisibility(View.VISIBLE); - initRecyclerView(rvImage, dynamicMediaList, noTextUi); - } else { - rvImage.setVisibility(View.GONE); - } - - //时间 - helper.setText(R.id.tv_time, TimeUiUtils.getDynamicUi(item.getPublishTime())); - - ExpandableTextView etvContent = helper.getView(R.id.etv_content); - etvContent.setEventType(1); - if (noTextUi) { - etvContent.setVisibility(View.GONE); - } else { - etvContent.setVisibility(View.VISIBLE); - CharSequence formatText = DynamicUiHelper.formatFirstDynamicContent( - item, etvContent.mTv, iconWidth, iconHeight); - etvContent.setText(formatText, mCollapsedStatus, helper.getAdapterPosition(), mCollapsedHeightStatus); - } - - helper.setGone(R.id.layout_root_mini_world, item.getTag() != null); - helper.setText(R.id.tv_mini_world_name, "#" + item.getTag()); - - //评论 - setCommentCount(helper, item.getCommentCount()); - - //点赞 - setLikeCount(helper, item.getLikeCount(), item.isLike(), false); - LinearLayout llLike = helper.getView(R.id.ll_like); - llLike.setEnabled(true); - llLike.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (item.getDynamicId() == 0) { - SingleToastUtil.showToast(ResUtil.getString(R.string.the_default_dynamic_cannot_be_liked)); - return; - } - llLike.setEnabled(false); - int status = item.isLike() ? 0 : 1; - DynamicModel.get().like(worldId, item.getDynamicId(), item.getUid(), status, 1) - .compose(RxHelper.bindContext(context)) - .subscribe(new DontWarnObserver() { - @Override - public void accept(String s, String error) { - super.accept(s, error); - llLike.setEnabled(true); - if (error != null) { - SingleToastUtil.showToast(error); - } else { - LogUtil.print(mContext.getString(R.string.me_call_the_like_interface_to_complete)); - if (status == 1) { - item.setLikeCount(item.getLikeCount() + 1); - } else { - item.setLikeCount(item.getLikeCount() - 1); - } - item.setLike(status == 1); - setLikeCount(helper, item.getLikeCount(), item.isLike(), true); - } - } - }); - } - }); - //评论 - helper.getView(R.id.ll_comment).setOnClickListener(v -> { - if (item.getDynamicId() == 0) { - SingleToastUtil.showToast(ResUtil.getString(R.string.the_default_dynamic_cannot_be_commented)); - return; - } - DynamicDetailActivity.start(context, item.getDynamicId(), worldId, - helper.getAdapterPosition(), true, 1); - } - ); - helper.setVisible(R.id.iv_more, item.getDynamicId() != 0); - if (item.getDynamicId() != 0) { - helper.addOnClickListener(R.id.iv_more).addOnClickListener(R.id.ll_share); - } - - View.OnClickListener toDetailListener = v -> { - if (item.getDynamicId() == 0) { - return; - } - DynamicDetailActivity.start(context, item.getDynamicId(), worldId, - helper.getAdapterPosition(), false, 1); - }; - - if (etvContent.mTv != null) { - etvContent.mTv.setOnClickListener(toDetailListener); - } - //跳转去详情 - helper.itemView.setOnClickListener(toDetailListener); - helper.setGone(R.id.line_bottom, getItemCount() - 1 != helper.getLayoutPosition()); - } - - private void setLikeCount(BaseViewHolder helper, int likeCount, boolean isLike, boolean isAnim) { - TextView tvLike = helper.getView(R.id.tv_like); - String likeCountStr; - if (likeCount < 0) { - likeCountStr = "0"; - } else if (likeCount >= 1000) { - likeCountStr = "999+"; - } else { - likeCountStr = String.valueOf(likeCount); - } - tvLike.setText(likeCountStr); - - ImageView ivLikeAnim = helper.getView(R.id.iv_like_pic); - if (isLike) { - ivLikeAnim.setImageResource(R.drawable.icon_dy_list_like); - } else { - ivLikeAnim.setImageResource(R.drawable.icon_dy_list_like_false); - } - - } - - private void initRecyclerView(RecyclerView rvImage, List imageUrl, boolean noTextUi) { - if (imageUrl == null) { - return; - } - CalcSize calcSize = new CalcSize(imageBorder); - ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) rvImage.getLayoutParams(); - if (imageUrl.size() > 1) { - params.width = ViewGroup.LayoutParams.MATCH_PARENT; - params.height = ViewGroup.LayoutParams.WRAP_CONTENT; - } else { - //单图的情况，按比例显示 - DynamicMedia media = null; - if (imageUrl.size() > 0) { - media = imageUrl.get(0); - } - if (media == null) { - return; - } - calcSize = ImageUiHelper.calcImage(media, imageBorder); - params.width = calcSize.width + divider; - params.height = calcSize.height + divider; - } - rvImage.setLayoutParams(params); - rvImage.setNestedScrollingEnabled(false); - rvImage.setLayoutManager(new GridLayoutManager(mContext, imageUrl.size() > 2 ? 3 : imageUrl.size())); - DynamicImageAdapter adapter = new DynamicImageAdapter(R.layout.item_dynamic_image, imageUrl); - adapter.setSingleImageHeight(calcSize.height); - adapter.setOnItemClickListener((adapter1, view, position) -> { - PagerOption option = new PagerOption().setSave(true); - BigPhotoActivity.start((Activity) mContext, ObjectTypeHelper.mediaToCustomList(imageUrl), - position, option); - } - ); - rvImage.setAdapter(adapter); - } - - private void setCommentCount(BaseViewHolder helper, int commentCount) { - TextView tvComment = helper.getView(R.id.tv_comment); - String commentCountStr; - if (commentCount < 0) { - commentCountStr = "0"; - } else if (commentCount >= 1000) { - commentCountStr = "999+"; - } else { - commentCountStr = String.valueOf(commentCount); - } - tvComment.setText(commentCountStr); - } - -} diff --git a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt deleted file mode 100644 index 9857685a4..000000000 --- a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt +++ /dev/null @@ -1,169 +0,0 @@ -package com.chwl.app.ui.user.fragment - -import android.view.View -import androidx.fragment.app.activityViewModels -import androidx.lifecycle.Observer -import androidx.recyclerview.widget.LinearLayoutManager -import com.trello.rxlifecycle3.android.FragmentEvent -import com.chwl.app.R -import com.chwl.app.UIHelper -import com.chwl.app.avroom.ButtonItemFactory -import com.chwl.app.base.BaseViewBindingFragment -import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener -import com.chwl.app.community.helper.ShareDynamicHelper -import com.chwl.app.databinding.FragmentUserinfoDynamicBinding -import com.chwl.app.ui.user.adapter.UserInfoDynamicAdapter -import com.chwl.app.ui.user.viewmodel.UserInfoViewModel -import com.chwl.app.ui.widget.ButtonItem -import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration -import com.chwl.core.XConstants -import com.chwl.core.auth.AuthModel -import com.chwl.core.community.bean.WorldDynamicBean -import com.chwl.core.community.dynamic.DynamicModel -import com.chwl.core.community.event.DynamicRefreshEvent -import com.chwl.core.user.UserModel -import com.chwl.core.user.bean.UserDetailInfo -import com.chwl.core.utils.net.BeanObserver -import com.chwl.core.utils.net.DontWarnObserver -import com.chwl.library.annatation.ActLayoutRes -import com.chwl.library.utils.ResUtil -import com.chwl.library.utils.SizeUtils -import org.greenrobot.eventbus.EventBus -import org.greenrobot.eventbus.Subscribe -import org.greenrobot.eventbus.ThreadMode - -@ActLayoutRes(R.layout.fragment_userinfo_dynamic) -class UserInfoDynamicFragment : BaseViewBindingFragment() { - private val vm by activityViewModels() - private var dynamicAdapter: UserInfoDynamicAdapter? = null - override fun init() { - EventBus.getDefault().register(this) - vm.userInfoDetailData.observe(this, Observer { dataBean: UserDetailInfo.DataBean -> - initDynamicList(dataBean.dynamicInfo) - }) - } - - @Subscribe(threadMode = ThreadMode.MAIN) - fun onDynamicRefreshEvent(event: DynamicRefreshEvent?) { - if (isResumed) { - vm.userInfoDetailData.observe(this, Observer { dataBean: UserDetailInfo.DataBean -> - initDynamicList(dataBean.dynamicInfo) - }) - } - } - - /** - * 动态列表 - * - * @param list - */ - private fun initDynamicList(list: List) { - if (dynamicAdapter == null) { - binding.rvDynamic.layoutManager = LinearLayoutManager(mContext) - binding.rvDynamic.addItemDecoration(HorizontalDecoration(SizeUtils.dp2px(mContext, 12f), false, false)) - dynamicAdapter = UserInfoDynamicAdapter(mContext) - dynamicAdapter?.setEnableLoadMore(false) - dynamicAdapter?.setOnItemChildClickListener { _, view: View, pos: Int -> - val bean: WorldDynamicBean = - dynamicAdapter?.getItem(pos) ?: return@setOnItemChildClickListener - if (view.id == R.id.iv_more) { - val list: MutableList = ArrayList() - if (!UserModel.get().isMyseft(bean.uid)) { - val item = ButtonItem( - getString(R.string.me_shield_dynamic) - ) { - UserModel.get().addReport(bean.dynamicId, 0) - .subscribe(object : BeanObserver() { - override fun onErrorMsg(error: String) { - dialogManager.dismissDialog() - toast(error) - } - - override fun onSuccess(s: String) { - dialogManager.dismissDialog() - toast(ResUtil.getString(R.string.me_shield_success)) - if (pos < (dynamicAdapter?.data?.size ?: 0)) { - if (bean == dynamicAdapter?.getItem(pos)) { - dynamicAdapter?.remove(pos) - } - } - } - }) - } - list.add(item) - } - if (!UserModel.get().isMyseft(bean.uid)) { - val blackListItem = ButtonItemFactory.createAddToBlackListItem( - dialogManager, bean.uid.toString() - ) - list.add(blackListItem) - } - if (!UserModel.get().isMyseft(bean.uid)) { - val item = ButtonItem( - getString(R.string.me_report_dynamic) - ) { - UIHelper.showReportPage( - mContext, bean.uid, - XConstants.REPORT_TYPE_DYNAMIC_SQUARE - ) - } - list.add(item) - } - if (UserModel.get().isMyseft(bean.uid) || - isThisWorldOwner(bean) - ) { - val item = ButtonItem( - getString(R.string.me_delete) - ) { deleteDynamic(pos, dynamicAdapter) } - list.add(item) - } - dialogManager.showCommonPopupDialog(list, getString(R.string.cancel)) - } else if (view.id == R.id.ll_share) { - ShareDynamicHelper(activity).share(bean) - } - } - binding.rvDynamic.adapter = dynamicAdapter - } - dynamicAdapter?.setNewData(list) - } - - - private fun deleteDynamic(pos: Int, adapter: UserInfoDynamicAdapter?) { - dialogManager.showOkCancelWithTitleDialog(getString(R.string.me_cannot_be_restored), - OkCancelDialogListener { - val bean = adapter?.getItem(pos) ?: return@OkCancelDialogListener - DynamicModel.get().delete(bean.worldId, bean.dynamicId) - .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) - .doOnSubscribe { dialogManager.showProgressDialog(mContext) } - .subscribe(object : DontWarnObserver() { - override fun accept(s: String?, error: String?) { - super.accept(s, error) - dialogManager.dismissDialog() - if (error != null) { - toast(error) - } else { - toast(getString(R.string.me_successfully_delete)) - if (pos < adapter.data.size) { - if (bean == adapter.getItem(pos)) { - adapter.remove(pos) - } - } - } - } - }) - }) - } - - /** - * 判断自己是不是该世界的创始人 - */ - private fun isThisWorldOwner(bean: WorldDynamicBean?): Boolean { - return bean != null && bean.worldUid == AuthModel.get().currentUid - } - - override fun onDestroyView() { - EventBus.getDefault().unregister(this) - super.onDestroyView() - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java index a118152ab..74859583b 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java @@ -454,7 +454,7 @@ public class TuTuGuideHelper { ImageView imageView; imageView = new ImageView(context); imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - imageView.setImageResource(R.drawable.icon_guide_to_add_world_tips); +// imageView.setImageResource(R.drawable.icon_guide_to_add_world_tips); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( UIUtil.dip2px(context, 277), UIUtil.dip2px(context, 115) ); diff --git a/app/src/module_mini_world/java/com/chwl/app/miniworld/listener/DoubleClickCheckListener.java b/app/src/main/java/com/chwl/app/utils/DoubleClickCheckListener.java similarity index 95% rename from app/src/module_mini_world/java/com/chwl/app/miniworld/listener/DoubleClickCheckListener.java rename to app/src/main/java/com/chwl/app/utils/DoubleClickCheckListener.java index c61abfbd0..ffb0681bb 100644 --- a/app/src/module_mini_world/java/com/chwl/app/miniworld/listener/DoubleClickCheckListener.java +++ b/app/src/main/java/com/chwl/app/utils/DoubleClickCheckListener.java @@ -1,4 +1,4 @@ -package com.chwl.app.miniworld.listener; +package com.chwl.app.utils; import android.view.View; diff --git a/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java b/app/src/main/java/com/chwl/app/utils/ObjectTypeHelper.java similarity index 98% rename from app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java rename to app/src/main/java/com/chwl/app/utils/ObjectTypeHelper.java index d3708bcbc..3db3f78c2 100644 --- a/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java +++ b/app/src/main/java/com/chwl/app/utils/ObjectTypeHelper.java @@ -1,4 +1,4 @@ -package com.chwl.app.community.utils; +package com.chwl.app.utils; import com.chwl.core.community.bean.DynamicMedia; import com.example.matisse.internal.entity.CustomItem; diff --git a/app/src/module_community/res/drawable-xhdpi/bg_search_user.webp b/app/src/main/res/drawable-xhdpi/bg_search_user.webp similarity index 100% rename from app/src/module_community/res/drawable-xhdpi/bg_search_user.webp rename to app/src/main/res/drawable-xhdpi/bg_search_user.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_more_publish.png b/app/src/main/res/drawable-xhdpi/ic_arrow_more_publish.png new file mode 100644 index 0000000000000000000000000000000000000000..ffd4250534f4e9e79520ec0e0fed8c7e69e8427f GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp@KrF_>3?yG(;T8u{Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL#0(?ST-3xs7fWhwFyEks!2xRWqu>;5kGIoIhkPQ)m2->nKgKXk23GxeO z`1W`f??vh4b?&AIRYMzJR``PK2=jDt4B@z*Y*2H6f$h_L#gf1E%m!!m{xd5Te5~i5 z@odWfw+v}MfA+Kb6rZg3WiS@|%g=n-=GS}$ruKjA3YQHES6D5uV^=9oc;@uB@g{dM f`2?Wjnx7fnJQc*d$ZgmibTL7c7s1%ISh>EBZ zjM0_ZMg6&nlL99QZtKb~1T$z<{*Z!dK`9z=i!J?|tWhK|MqRT9#N{VR6(||Zpi%h) zFznd;G0mr}0(t=YKZ9w>Njl(&fZMWrBqgL`QTbXhhbf!!zRTjlCU!R481?EUTk;*~ zg4xr8>B^C}Ll3&f0l=8DYNR>*Jg|b#bdLcEq&}vy|6Zn;i513p`LX~2002ovPDHLk FV1i1LgCqa| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_draw_gift_close.png b/app/src/main/res/drawable-xhdpi/ic_draw_gift_close.png new file mode 100644 index 0000000000000000000000000000000000000000..5419a9fecee3211ef794fbdfd0566b005bdcc925 GIT binary patch literal 826 zcmV-A1I7G_P)Px%^hrcPR9HvVna__6K@i73g%CkR1o0yd4hRPvgpiO37b5%xB5`nc^Wz}goVmOB z14KCPZG~(E7p#MWY%D7xnDzm+s`@kas;jDNj26o|Hy>CD ztOAw+OMyke0&n&Q@D=z3OabqK4`%i=c3X>4bk3~-HUet_L5D2CjsvgF>|KbWWP^a6 zbL)Vu!1Bx1d)29X7;R~ZeL*M+zwz<5r6S`Y&Lg4Gzu10c-j^I*3EX>`?~ZKZB{ODP&o0!pw&AFMGhgDC~)~ zI>UMo^WstjRw$&ZV5#{h&1|SwntgAuFZC{o?cG=Jk$KoTr>vlg_CK#NGaE7AA|8wA zy7X{ofdjxT;9i5LT@Rf1P1hyhV*{OBL|xup0jr@=c8FO5U93L|xCz`DU_`K2fE8Zm z8t@=+(_sN`2Q~*P=Hf?zGu~r^pv$n&fy==6zQ9HoGj431k07*qoM6N<$ Ef&z4b3;+NC literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_draw_gift_remove_all.png b/app/src/main/res/drawable-xhdpi/ic_draw_gift_remove_all.png new file mode 100644 index 0000000000000000000000000000000000000000..b72065ed7cf81911509a1ba5f9781ce3e5e7ede6 GIT binary patch literal 966 zcmV;%13CPOP)Px&fJsC_R9HvVnOlfWQ5eU6pL=c({Hl4nv94|tFl+t`CICn0OdN8qCuF%sOMwo_*%*z0Nsv+N-9inYF(4TWfvm`~KhB zMg`3|Hx!rvOa#UOV}KFBFmLt`&;|Sez5`!@Z)Wy4bXp4;=$xAb%mk(Yg3i(e+Xj3v zv-T_l)i)Ecb8ady4;Y_yq7wZ(fY)aBIjy}^z|OhRz+yl5;{eZpCE~|8lsx-bi?$dpMeKc4%2p25vdUO#RqR}G`ysCzwD=lQaU%Qz# z7XR1_?32RsP^&c_*Hla{QDC`3B^gYovj>DanhcBreglVrj{y@kN_!M`*g2=Dpo|vUb^!Zoxsi%HX8-3W15qqbFs^6K)Woz+$ebnG-VjCu8KyIsSmurYj+=~u<=&F zE4&a-(Z5fZMZjs`E^sO1-~+%`-~{kI!`Lz2=r;-lYo!=XmLn2n>V7`?}CpE zXDS5l&Lwa)U82@ITyTkMUbens>j_*)%?j*U z#816|d&G}s50sZlE+MTeeX$QHzMJU;uXx=c&8!xZ>3Za)2M%!y`MxsOL*SeT(F>+B z+lyG{S?DvLUNF^;02_d#UPGrzRR0CMht66e>1p-4uP`*RG;Nxu1!h($ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_draw_gift_remove_last.png b/app/src/main/res/drawable-xhdpi/ic_draw_gift_remove_last.png new file mode 100644 index 0000000000000000000000000000000000000000..434d63fe1faeb04ffd9837b48e724de8ac58a149 GIT binary patch literal 976 zcmV;>126oEP)Px&ib+I4R9HvVnOlfWVHC%I%PqNIb4xC{t|p}6!JsKd0iKJWLuGN2tiX|M$Vu;HG3l>4dtAa zCEQOto8(t^r~e~tIlH{4ThvST^~s#>LfERonm#yS-p`{4u{K^kl7v@Pv2=M!CUMOo zQWyQRldv^~6?wf@+3rEqT;hZ^74md2)ew6D&HHn}ohp!T5s})?)@<59(;@3x1RMY+ zm|=~P&g#d5uT$+&+Tjp_?v8de?-~GXv!6)(JOxgw8uL2Ih-(y)dNGN(A%p7D-P{i> zwt(%xRp2t9zgKIi%BxYrDrmgvptyaeeU+H*=4sUc)nb|OTc?B<0COAxcK}-xlJqN( zs<6y=EASe)0X%WUD+hV0gjbpnPxEobCW zr&{|Hu*-puASJ?CQX=Vl3UDwsm1qSx>mYC#SPiHe+v31SkWxx`4_zg{dIzx`SO#1I z9yQY&ZvO%_H7T5~c@#YW0000w;#h&D!dwV|b z{r~#^pZ_`M3WCb?s2kR_xL`+1Cj?M_L%D+jWszNF8dtmAM!AG?;*njj9rd|VC`MY{ z0S`Ctf~`2v`DQk-EBQg1T~Z#O?~?Ml^5)Lu@_3nCPZGHwuHQ`c#QaVwm!;O_`)Emd z&Sw6Zl*&8P^W^tZcwhNlJ2UHp?=$%w;4EG@wRXUR^8(G;2^+D)iROetZaQ7i#|A-| zYgczcl~76Qyw+YYJ6!OX(+yji-Eb6jIVJ1Y4Og7I;RQ{dW5+)12%Isw(BgqNF@H%# z_4At=-JoxA!#k+!aY@$*ka!!sU{DLK5gT82dc;odHt&XQLI>PmQE_n-bCam+PY~d& zsCy5bLl(>OhvtC^*3jXBYj|B(QE6!t>V3UqH{3v%$rz01gtzK*Fk$5jjy(YOJ@hO_ zJarW{mM5)119I$zON<4|8D~G}GLzm1L-xH0Z7*DG@j~@NeJQ6W(rS0lj5=MBj)K}_ zJ5f9lr;0J1PS5nlSi9+sD#vScxFcgu_sniJ?a*y5M;5=M5dlIxpgckDf!CV$QLyia z+t^^$LjE^0<)I>gNkOhiYRmoramC6oQS9!>5vFKKCgSxu!KvhyrGV!hQ~j*_;qj(@ zFw5AWVQolTr#0?}iKhJkC?6K=n_aUn;lte!1@8;)C!w@V!YeatU8m>nx_rPXz)_Hy zpJSFj(_SiYEFrkhBsQ0mf<%P&USk)9#xA%h_~8K!3jdpX(Hk22f%%d+oUGswf@p2% z%49GoaadwGiugxR32i>Wu_f4wF8UW^w4w`MPfUad==l`~5!?ZIOH(wIqBJe8Fq`n! zmaA@j9uw!Nl=jRe#^*_9nFwi$Neon^l~;BGWMm?n>((e4!8UZm2gnIfVs&gium&@s zp_|@Z?T3dK0=T4rAPcy7fT94aRVkp!Y?XJ{N#&voW|o(1aVcf^n-6SC0j>r&L>dm# z>4t+q8oHoKsPBdy^NCoC(l{w zdFsdD!DaZPjmbfca`{9)t`s>187nljt-|si8m#Z3P=5&CE;cx)JK~kC#S`gP32rR6 zFjuDxF54V8pWq6anToIdDE*r6M?7 z2Cx7nq1>3oia`q(oWvqZ87OmiZRG%mo6dH|3T0AQ)=vS2c7pEfF{??q<~;2B_<&QzE$9Bb4T8QA6Ad50w&}R#z!T zf(SujCuA%EPQ2!tOVc92QUxarTy2cklu-Kxy^R9aJoYBB<2mlZ=N6O2v897Ty*AFe z^6x*kBq-@}fF(;mI2kLHYr@h2a&hSZbCe7OfL|e8qg4UU` zj*C5u6r`l|pSmfKd5bQSMa!-_E4bRD@LbJN3N-`tJE6u$M`{KMSbWg7kiltpm5FGu znBa;z$5{qRyLAx34dR;H;v?IwK8oPT(FJaCMO(+I-5*tZoTPQHQl8^{G;H;WMz&cn z4Z}*yF$8yvOl3W+TjZ`XUvTmLOX+AQDWH(Iy~+Tt+6Pu-G>fcA?EuurGKZq)EJFxy zD7(8XC%Cw~$|jjynHq436NBVUW;F}^Vt}&@Lwofwf$Aapm7Hll4x7xw6tG}iIGy>s zzFfyPTFcY-6y-&)Dpx64#+Y<^(8h0A^U>vEag`0Hz)(F*ubYn(upWn35+w-B>?c>u zehQ}J@NpgorPq}XN*$irm&LM7`c$EXh{Ios1`cHx&av&g5m7mbdreWVd-}`rEVy_Zla8e_whD~zNvCMsg9l>Kb(Bkhfw|x$Ol@`ibA-7%ayd=P<8_pzuhe%Blc?bo{d!3#`f5HOQ580EjzSXxd>02htP4la z;Pv{FFu4_1az%2=KL~45cPjcl-uL2lvmqeuJ*r6m0q8lafVKxjWdHyG07*qoM6N<$ Ef=vGPH~;_u literal 0 HcmV?d00001 diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_first_charge_gift_dialog_enter.webp b/app/src/main/res/drawable-xhdpi/ic_first_charge_gift_dialog_enter.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_first_charge_gift_dialog_enter.webp rename to app/src/main/res/drawable-xhdpi/ic_first_charge_gift_dialog_enter.webp diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_msg_audio_party_arrow.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_arrow.webp rename to app/src/main/res/drawable-xhdpi/ic_msg_audio_party_arrow.webp diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_arrow_white.webp b/app/src/main/res/drawable-xhdpi/ic_msg_audio_party_arrow_white.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_arrow_white.webp rename to app/src/main/res/drawable-xhdpi/ic_msg_audio_party_arrow_white.webp diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_color.webp b/app/src/main/res/drawable-xhdpi/ic_msg_audio_party_color.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_color.webp rename to app/src/main/res/drawable-xhdpi/ic_msg_audio_party_color.webp diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_white.webp b/app/src/main/res/drawable-xhdpi/ic_msg_audio_party_white.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_msg_audio_party_white.webp rename to app/src/main/res/drawable-xhdpi/ic_msg_audio_party_white.webp diff --git a/app/src/module_community/res/drawable-xhdpi/ic_trash_common.webp b/app/src/main/res/drawable-xhdpi/ic_trash_common.webp similarity index 100% rename from app/src/module_community/res/drawable-xhdpi/ic_trash_common.webp rename to app/src/main/res/drawable-xhdpi/ic_trash_common.webp diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_withdraw_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_withdraw_arrow.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_withdraw_arrow.webp rename to app/src/main/res/drawable-xhdpi/ic_withdraw_arrow.webp diff --git a/app/src/module_mini_world/res/drawable-xhdpi/ic_withdraw_record_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_withdraw_record_arrow.webp similarity index 100% rename from app/src/module_mini_world/res/drawable-xhdpi/ic_withdraw_record_arrow.webp rename to app/src/main/res/drawable-xhdpi/ic_withdraw_record_arrow.webp diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_add_image.webp b/app/src/main/res/drawable-xhdpi/icon_dy_add_image.webp similarity index 100% rename from app/src/module_community/res/drawable-xhdpi/icon_dy_add_image.webp rename to app/src/main/res/drawable-xhdpi/icon_dy_add_image.webp diff --git a/app/src/main/res/drawable-xhdpi/icon_dy_delete_pic.png b/app/src/main/res/drawable-xhdpi/icon_dy_delete_pic.png new file mode 100644 index 0000000000000000000000000000000000000000..52ead7262fe4ef46ad9c502b9495daf199059884 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m%mREuT>rzsrcIl+Z{H5#xfl4% zoH_H)pFcqEym|9rO8y@^b_~eAbmn*v~RyQJuZE4boyK4I&I;?dq=NVMjQ<;=2*Amh0~0qy`oQMNvyIC zaoDM)5?K@;6S~QeQ_pqvx?suJ(}6L|jk0FN$!-fjex@{M&x&mExBr=TohytN=-F7j zQd__8^lcOF{8>wL_LeDYZeLn7xq7{|(JAH?w&yA>?yP?MKX9>ZjO8lB6|$?&EB|8l XiszepTg%QL=ye89S3j3^P6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/main/res/layout/fragment_single_room.xml similarity index 100% rename from app/src/module_mini_world/res/layout/fragment_single_room.xml rename to app/src/main/res/layout/fragment_single_room.xml diff --git a/app/src/main/res/layout/fragment_userinfo_dynamic.xml b/app/src/main/res/layout/fragment_userinfo_dynamic.xml deleted file mode 100644 index 94c7c4ce9..000000000 --- a/app/src/main/res/layout/fragment_userinfo_dynamic.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_community_notice_list.xml b/app/src/main/res/layout/item_community_notice_list.xml similarity index 100% rename from app/src/module_community/res/layout/item_community_notice_list.xml rename to app/src/main/res/layout/item_community_notice_list.xml diff --git a/app/src/main/res/layout/item_home_dynamic.xml b/app/src/main/res/layout/item_home_dynamic.xml deleted file mode 100644 index e917cface..000000000 --- a/app/src/main/res/layout/item_home_dynamic.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_preview_photo.xml b/app/src/main/res/layout/item_preview_photo.xml similarity index 95% rename from app/src/module_community/res/layout/item_preview_photo.xml rename to app/src/main/res/layout/item_preview_photo.xml index 6d1533480..7108223f2 100644 --- a/app/src/module_community/res/layout/item_preview_photo.xml +++ b/app/src/main/res/layout/item_preview_photo.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/module_community/res/layout/item_publish_image.xml b/app/src/main/res/layout/item_publish_image.xml similarity index 100% rename from app/src/module_community/res/layout/item_publish_image.xml rename to app/src/main/res/layout/item_publish_image.xml diff --git a/app/src/main/res/layout/layout_choose_worlds.xml b/app/src/main/res/layout/layout_choose_worlds.xml deleted file mode 100644 index 403481299..000000000 --- a/app/src/main/res/layout/layout_choose_worlds.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/layout_des_personal.xml b/app/src/main/res/layout/layout_des_personal.xml deleted file mode 100644 index 86218d075..000000000 --- a/app/src/main/res/layout/layout_des_personal.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/layout/layout_des_photo.xml b/app/src/main/res/layout/layout_des_photo.xml deleted file mode 100644 index 867b87206..000000000 --- a/app/src/main/res/layout/layout_des_photo.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/layout/layout_desc_game.xml b/app/src/main/res/layout/layout_desc_game.xml deleted file mode 100644 index 4cf9ca63f..000000000 --- a/app/src/main/res/layout/layout_desc_game.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_desc_voice.xml b/app/src/main/res/layout/layout_desc_voice.xml deleted file mode 100644 index 43873a024..000000000 --- a/app/src/main/res/layout/layout_desc_voice.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/layout_user_family.xml b/app/src/main/res/layout/layout_user_family.xml deleted file mode 100644 index 8dda4911b..000000000 --- a/app/src/main/res/layout/layout_user_family.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/layout_user_join_worlds.xml b/app/src/main/res/layout/layout_user_join_worlds.xml deleted file mode 100644 index 91cb106ab..000000000 --- a/app/src/main/res/layout/layout_user_join_worlds.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/msg_open_audio_party.xml b/app/src/main/res/layout/msg_open_audio_party.xml similarity index 100% rename from app/src/module_mini_world/res/layout/msg_open_audio_party.xml rename to app/src/main/res/layout/msg_open_audio_party.xml diff --git a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml b/app/src/main/res/layout/nim_recent_contact_team_list_item.xml similarity index 100% rename from app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml rename to app/src/main/res/layout/nim_recent_contact_team_list_item.xml diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d40bd18a4..2ca7e8324 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -715,4 +715,6 @@ #1E1E1F #84868A #8E9094 + #262629 + #FE6974 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 334604b69..259390bc8 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -538,10 +538,6 @@ #30F4F4F4 - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java index bba230708..829477a2e 100644 --- a/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java +++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java @@ -17,7 +17,6 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.chwl.app.R; import com.chwl.app.base.BaseFragment; -import com.chwl.app.miniworld.activity.MWTeamRoomMessageAct; import com.chwl.app.module_hall.im.NimHelper; import com.chwl.app.ui.im.recent.TeamExt; import com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity; @@ -145,8 +144,6 @@ public class RoomMsgRecentListFragment extends BaseFragment { NimHallTeamRoomMessageActivity.start(mContext, recent.getContactId()); } else if (type == 0) { NimTeamRoomMessageActivity.start(mContext, recent.getContactId()); - } else if (type == 2) { - MWTeamRoomMessageAct.start(mContext, recent.getContactId()); } else { toast(ResUtil.getString(R.string.room_chat_fragment_roommsgrecentlistfragment_02)); }