moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增家族长关联房间入口

Browse Source
This commit is contained in:
huangjian
2021-10-13 16:30:59 +08:00
parent b18fae7c3d
commit b88ea5eb48
5 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
View File

@@ -145,6 +145,13 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
//模厅
HallDataManager.get().registerHallExist(this, hallExist -> {
if (HallDataManager.get().isClanElder()) {
mBinding.meItemLinkRoom.setVisibility(View.VISIBLE);
mBinding.lineLinkRoom.setVisibility(View.VISIBLE);
} else {
mBinding.meItemLinkRoom.setVisibility(View.GONE);
mBinding.lineLinkRoom.setVisibility(View.GONE);
}
if ((hallExist != null && hallExist) || HallDataManager.get().isHasClan()) {
mBinding.meItemUnion.setText("我的公会");
mBinding.meItemUnion.setVisibility(View.VISIBLE);
@@ -344,6 +351,9 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
case R.id.match_prize:
FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_PRIZE, null);
break;
case R.id.me_item_link_room:
CommonWebViewActivity.start(mContext, UriProvider.getLinkRoomUrl());
break;
default:
break;
}

32
app/src/main/res/layout/fragment_me.xml
View File

@@ -224,9 +224,9 @@
android:gravity="bottom"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_15"
app:layout_constraintStart_toEndOf="@+id/layout_user_info"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar_head_wear"
app:layout_constraintEnd_toEndOf="parent">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/layout_user_info">
<View
android:layout_width="1dp"
@@ -638,6 +638,34 @@
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<View
android:id="@+id/line_link_room"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="@color/line_353548"
android:visibility="gone" />
<TextView
android:id="@+id/me_item_link_room"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:drawableStart="@mipmap/icon_me_link_room"
android:drawableEnd="@drawable/arrow_right"
android:drawablePadding="13dp"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/menu_link_room"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>

BIN
app/src/main/res/mipmap-xhdpi/icon_me_link_room.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

1
app/src/main/res/values/strings.xml
View File

@@ -102,6 +102,7 @@
<string name="menu_my_auction">竞拍记录</string>
<string name="menu_setting">设置</string>
<string name="menu_certification">实名认证</string>
<string name="menu_link_room">关联房间</string>
<string name="text_chat_limit">仅%s或%s的用于可发起聊天</string>

9
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -328,4 +328,13 @@ public class UriProvider {
public static String getLinkAccountUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/game/bindAccount.html");
}
/**
* 族长号关联房间
*
* @return
*/
public static String getLinkRoomUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/associateAccount/index.html");
}
}