yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI对稿

Browse Source
This commit is contained in:
huangjian
2023-02-09 17:51:12 +08:00
parent 4186ee8920
commit 05f0153159
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java
View File

@@ -742,7 +742,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
.flatMap(luckyBagNoticeInfos -> Observable.intervalRange(0, Integer.MAX_VALUE, 0, 5, TimeUnit.SECONDS)) .flatMap(luckyBagNoticeInfos -> Observable.intervalRange(0, Integer.MAX_VALUE, 0, 5, TimeUnit.SECONDS))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> { .subscribe(aLong -> {
int index = Math.toIntExact(aLong) % luckyMsgAdapter.getItemCount(); int index = aLong.intValue() % luckyMsgAdapter.getItemCount();
if (index == 0) { if (index == 0) {
rvLuckyMsg.scrollToPosition(index); rvLuckyMsg.scrollToPosition(index);
} else { } else {
@@ -759,7 +759,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
initInfo != null && initInfo.isTwelveStarSwitch()) { initInfo != null && initInfo.isTwelveStarSwitch()) {
llStarWeek.setVisibility(View.VISIBLE); llStarWeek.setVisibility(View.VISIBLE);
} else { } else {
llStarWeek.setVisibility(View.INVISIBLE); llStarWeek.setVisibility(View.GONE);
return; return;
} }

4
app/src/main/java/com/mango/moshen/ui/widget/PrivateChatGiftDialog.java
View File

@@ -211,7 +211,7 @@ public class PrivateChatGiftDialog extends BottomSheetDialog implements View.OnC
WindowManager.LayoutParams params = getWindow().getAttributes(); WindowManager.LayoutParams params = getWindow().getAttributes();
params.width = WindowManager.LayoutParams.MATCH_PARENT; params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = WindowManager.LayoutParams.MATCH_PARENT; params.height = WindowManager.LayoutParams.MATCH_PARENT;
params.dimAmount = 0f; params.dimAmount = 0.5f;
getWindow().setAttributes(params); getWindow().setAttributes(params);
mSubscribe = IMNetEaseManager.get().getChatRoomEventObservable().subscribe(this::onReceiveRoomEvent); mSubscribe = IMNetEaseManager.get().getChatRoomEventObservable().subscribe(this::onReceiveRoomEvent);
} }
@@ -405,7 +405,7 @@ public class PrivateChatGiftDialog extends BottomSheetDialog implements View.OnC
initInfo != null && initInfo.isTwelveStarSwitch()) { initInfo != null && initInfo.isTwelveStarSwitch()) {
llStarWeek.setVisibility(View.VISIBLE); llStarWeek.setVisibility(View.VISIBLE);
} else { } else {
llStarWeek.setVisibility(View.INVISIBLE); llStarWeek.setVisibility(View.GONE);
return; return;
} }

31
app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml
View File

@@ -15,6 +15,22 @@
android:orientation="vertical" android:orientation="vertical"
app:edit_view="@id/editTextMessage"> app:edit_view="@id/editTextMessage">
<TextView
android:id="@+id/tv_chat_limit"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/shape_white_8dp_round"
android:paddingStart="@dimen/dp_10"
android:paddingTop="@dimen/dp_2"
android:paddingEnd="@dimen/dp_10"
android:paddingBottom="@dimen/dp_2"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:visibility="gone"
tools:text="哈哈哈哈哈" />
<RelativeLayout <RelativeLayout
android:id="@+id/message_activity_list_view_container" android:id="@+id/message_activity_list_view_container"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -80,19 +96,6 @@
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
<TextView
android:id="@+id/tv_chat_limit"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/bg_chat_limit"
android:paddingStart="@dimen/dp_10"
android:paddingTop="@dimen/dp_2"
android:paddingEnd="@dimen/dp_10"
android:paddingBottom="@dimen/dp_2"
android:text="哈哈哈哈哈"
android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
@@ -184,8 +187,8 @@
android:id="@+id/buttonSendMessage" android:id="@+id/buttonSendMessage"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="15dp"
android:layout_marginStart="-9dp" android:layout_marginStart="-9dp"
android:layout_marginEnd="15dp"
android:background="@drawable/common_btn_bg" android:background="@drawable/common_btn_bg"
android:contentDescription="@string/empty" android:contentDescription="@string/empty"
android:enabled="false" android:enabled="false"

3
nim_uikit/res/layout/nim_message_item_tip.xml
View File

@@ -10,10 +10,9 @@
android:id="@+id/nim_message_item_text_body" android:id="@+id/nim_message_item_text_body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/nim_bg_message_tip"
android:paddingLeft="7dip" android:paddingLeft="7dip"
android:paddingRight="7dip" android:paddingRight="7dip"
android:textColor="@color/color_black_333333" android:textColor="@color/color_grey_999999"
android:textSize="12sp" android:textSize="12sp"
tools:text="12312313" /> tools:text="12312313" />
</LinearLayout> </LinearLayout>

2
nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderTip.java
View File

@@ -36,7 +36,7 @@ public class MsgViewHolderTip extends MsgViewHolderBase {
@Override @Override
protected void bindContentView() { protected void bindContentView() {
bodyTextView.setText("提示：" + getDisplayText()); bodyTextView.setText(getDisplayText());
} }
@Override @Override