修改ui，完成公会功能

app/build.gradle

@@ -178,6 +178,9 @@ def Lombok = "1.18.18"
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
     implementation fileTree(dir: 'aliyun-libs', include: ['*.jar','*.aar'])
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.4.+'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 

app/src/main/AndroidManifest.xml

@@ -1,31 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yizhuan.erban">
-
+    package="com.yizhuan.erban"> <!-- 云信集成小米推送 end -->
+    <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
     <!-- bugly所需权限 -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <!-- ShareSdk权限申请 -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <!-- 谷歌内购权限 -->
-    <uses-permission android:name="com.android.vending.BILLING" />
-
-    <!-- Required -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- ShareSdk权限申请 -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 谷歌内购权限 -->
+    <uses-permission android:name="com.android.vending.BILLING" /> <!-- Required -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
     <uses-permission
         android:name="android.permission.READ_PHONE_STATE"
         tools:node="remove" />
-
     <uses-permission
         android:name="android.permission.ACCESS_FINE_LOCATION"
         tools:node="remove" />
-
     <uses-permission
         android:name="android.permission.ACCESS_COARSE_LOCATION"
         tools:node="remove" />
@@ -34,9 +27,7 @@
         <package android:name="com.facebook.katana" />
         <package android:name="jp.naver.line.android" />
         <package android:name="com.android.vending" />
-    </queries>
-
-    <!-- 云信权限声明 -->
+    </queries> <!-- 云信权限声明 -->
     <!-- 控制呼吸灯，振动器等，用于新消息提醒 -->
     <uses-permission android:name="android.permission.FLASHLIGHT" />
     <uses-permission android:name="android.permission.VIBRATE" /> <!-- 外置存储存取权限 -->
@@ -51,9 +42,7 @@
     <uses-permission android:name="android.permission.REORDER_TASKS" />
 
     <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
-    <!-- 如果需要实时音视频通话模块，下面的权限也是必须的。否则，可以不加 -->
+    <uses-feature android:name="android.hardware.camera.autofocus" /> <!-- 如果需要实时音视频通话模块，下面的权限也是必须的。否则，可以不加 -->
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" /> <!-- SDK 权限申明, 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
@@ -61,21 +50,14 @@
     <permission
         android:name="${applicationId}.permission.RECEIVE_MSG"
         android:protectionLevel="signature" /> <!-- 接收 SDK 消息广播权限， 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
-    <uses-permission android:name="com.xteam.xchat.permission.RECEIVE_MSG" />
-
-    <!-- 云信集成小米推送 start -->
+    <uses-permission android:name="com.xteam.xchat.permission.RECEIVE_MSG" /> <!-- 云信集成小米推送 start -->
     <permission
         android:name="${applicationId}.permission.MIPUSH_RECEIVE"
         android:protectionLevel="signature" />
-    <uses-permission android:name="${applicationId}.permission.MIPUSH_RECEIVE" />
-    <!-- 云信集成小米推送 end -->
-
-    <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" /><!-- 云信集成华为推送 -->
 
+    <uses-permission android:name="${applicationId}.permission.MIPUSH_RECEIVE" /> <!-- 云信集成华为推送 -->
     <uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE" /> <!-- 云信集成oppo推送 -->
-    <uses-permission android:name="com.heytap.mcs.permission.RECIEVE_MCS_MESSAGE" />
-
-    <!-- 云信集成魅族推送 start -->
+    <uses-permission android:name="com.heytap.mcs.permission.RECIEVE_MCS_MESSAGE" /> <!-- 云信集成魅族推送 start -->
     <!-- 兼容flyme5.0以下版本，魅族内部集成pushSDK必填，不然无法收到消息，将{你的包名} 改开发者App的包名 -->
     <uses-permission android:name="com.meizu.flyme.push.permission.RECEIVE" />
 
@@ -104,7 +86,6 @@
         android:theme="@style/MyMaterialTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:name,android:allowBackup">
-
         <!-- 刘海屏适配 begin -->
         <!-- 小米 -->
         <meta-data
@@ -116,7 +97,6 @@
         <meta-data
             android:name="android.max_aspect"
             android:value="2.4" /> <!-- 刘海屏适配 end -->
-
         <provider
             android:name=".utils.BuglyFileProvider"
             android:authorities="${applicationId}.fileProvider"
@@ -127,17 +107,16 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths"
                 tools:replace="name,resource" />
-        </provider>
-
-
-        <!-- 云信配置 begin ##################################################### -->
+        </provider> <!-- 云信配置 begin ##################################################### -->
         <!--
            APP key, 可以在这里设置，也可以在 SDKOptions 中提供。
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
         <meta-data
             android:name="com.netease.nim.appKey"
-            android:value="09bde8b3d86b98a6612bc3fc92709799" /> <!-- 声明云信后台服务，如需保持后台推送，使用独立进程效果会更好。
+            android:value="09bde8b3d86b98a6612bc3fc92709799" />
+        <!--
+ 声明云信后台服务，如需保持后台推送，使用独立进程效果会更好。
             ca46478c438dda51d25306f52fe7506b
             09bde8b3d86b98a6612bc3fc92709799
         -->
@@ -164,10 +143,8 @@
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver> <!-- 云信进程间通信 Receiver -->
-        <receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
-        <!-- 云信进程间通信service -->
-        <service android:name="com.netease.nimlib.service.ResponseService" />
-        <!-- 申明本地电话状态（通话状态）的广播接收器，第三方APP集成时音视频模块时，如果需要在App中处理网络通话与本地电话的交互请加上此接收器 -->
+        <receiver android:name="com.netease.nimlib.service.ResponseReceiver" /> <!-- 云信进程间通信service -->
+        <service android:name="com.netease.nimlib.service.ResponseService" /> <!-- 申明本地电话状态（通话状态）的广播接收器，第三方APP集成时音视频模块时，如果需要在App中处理网络通话与本地电话的交互请加上此接收器 -->
         <!-- 在Demo的示例代码中是在Application进行了网络通话与本地电话的互斥处理 -->
         <receiver
             android:name=".reciever.IncomingCallReceiver"
@@ -177,22 +154,17 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".reciever.NotificationClickReceiver" /> <!-- 云信进程间通信provider -->
-
         <!-- 配置的service和receiver -->
-
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"
             android:authorities="${applicationId}.ipc.provider"
             android:process=":core" /> <!-- 配置的service和receiver -->
-
         <meta-data
             android:name="design_width"
             android:value="768" />
         <meta-data
             android:name="design_height"
-            android:value="1280" />
-        <!-- Autolayout####################################################配置 -->
-
+            android:value="1280" /> <!-- Autolayout####################################################配置 -->
         <activity
             android:name="com.soundcloud.android.crop.CropImageActivity"
             android:screenOrientation="portrait" /> <!-- tinker配置 begin ########################################################## -->
@@ -223,7 +195,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="com.mob.tools.MobUIShell"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -278,9 +249,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-
         </activity>
-
+        <activity
+            android:name=".home.activity.AssociationActivity"
+            android:label="@string/association_list"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.login.LoginPhoneActivity"
             android:label="@string/main_androidmanifest_01"
@@ -291,7 +264,6 @@
             android:label="@string/main_androidmanifest_02"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.login.BindPhoneActivity"
             android:label="@string/main_androidmanifest_03"
@@ -302,12 +274,10 @@
             android:label="@string/main_androidmanifest_04"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".UserGuideActivity"
             android:label="@string/main_androidmanifest_05"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.search.SearchActivity"
             android:screenOrientation="portrait" />
@@ -382,17 +352,14 @@
             android:name=".audio.AudioRecordActivity"
             android:label="@string/main_androidmanifest_017"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.pay.ChargeActivity"
             android:label="@string/main_androidmanifest_018"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".home.activity.CollectionRoomActivity"
             android:label="@string/main_androidmanifest_019"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.wallet.ExchangeGoldActivity"
             android:label="@string/main_androidmanifest_020"
@@ -406,15 +373,12 @@
         <activity
             android:name=".ui.relation.FansListActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.withdraw.WithdrawActivity"
-            android:screenOrientation="portrait" />
-        <!--   提现绑定银行卡     -->
+            android:screenOrientation="portrait" /> <!-- 提现绑定银行卡 -->
         <activity
             android:name=".ui.withdraw.bankcard.BindWithdrawBankCardActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.withdraw.WithdrawRuleActivity"
             android:screenOrientation="portrait" />
@@ -497,7 +461,6 @@
             android:name=".decoration.view.MyDecorationActivity"
             android:label="@string/main_androidmanifest_027"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".decoration.view.DecorationStoreActivity"
             android:screenOrientation="portrait"
@@ -623,14 +586,12 @@
         <activity
             android:name=".treasure_box.activity.TreasureBoxHonourActivity"
             android:theme="@style/dialog_web_view_activity" />
-
         <activity android:name=".ui.setting.VerifyPhoneActivity" />
         <activity android:name=".ui.setting.ModifyPwdActivity" />
         <activity
             android:name=".ui.widget.LevelUpDialog"
             android:launchMode="singleTop"
             android:theme="@style/dialogactivity" />
-
         <activity android:name=".home.activity.NewUserListActivity" />
         <activity
             android:name=".ui.widget.RecallDialog"
@@ -753,8 +714,7 @@
         <activity
             android:name=".avroom.recommendcard.MyRecommendCardActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-        <!-- 房间内私聊 -->
+            android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
         <activity
             android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
@@ -823,17 +783,14 @@
         <activity
             android:name=".miniworld.activity.MiniWorldMemberListActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".miniworld.activity.MiniWorldTeamMessageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-
         <activity
             android:name=".miniworld.activity.MWTeamRoomMessageAct"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" /> <!-- 房间内私聊 -->
-
         <activity
             android:name=".miniworld.activity.MiniWorldGroupThemeActivity"
             android:screenOrientation="portrait" />
@@ -849,96 +806,71 @@
         <activity
             android:name=".miniworld.activity.MiniWorldMainActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".ui.im.friend.ActFriendList" />
-
-        <!-- 银行卡列表 -->
+        <activity android:name=".ui.im.friend.ActFriendList" /> <!-- 银行卡列表 -->
         <activity
             android:name=".bank_card.activity.BankCardListActivity"
-            android:screenOrientation="portrait" />
-        <!-- 解除绑定银行卡 -->
+            android:screenOrientation="portrait" /> <!-- 解除绑定银行卡 -->
         <activity
             android:name=".bank_card.activity.BankCardListUnbindActivity"
-            android:screenOrientation="portrait" />
-        <!-- 绑定银行卡 -->
+            android:screenOrientation="portrait" /> <!-- 绑定银行卡 -->
         <activity
             android:name=".bank_card.activity.BankCardBindActivity"
-            android:screenOrientation="portrait" />
-        <!-- 隐私政策 -->
+            android:screenOrientation="portrait" /> <!-- 隐私政策 -->
         <activity
             android:name=".bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".home.activity.CommunityNoticeAct"
-            android:screenOrientation="portrait" />
-
-        <!--   社区     -->
+            android:screenOrientation="portrait" /> <!-- 社区 -->
         <activity
             android:name=".community.publish.view.PublishActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustNothing" />
-
         <activity
             android:name=".community.dynamic.view.DynamicDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".community.photo.PreviewPhotoActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".community.photo.BigPhotoActivity"
-            android:screenOrientation="portrait" />
-
-        <!--   知乎相册     -->
+            android:screenOrientation="portrait" /> <!-- 知乎相册 -->
         <activity
             android:name="com.zhihu.matisse.ui.MatisseActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.zhihu.matisse.internal.ui.AlbumPreviewActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.zhihu.matisse.internal.ui.SelectedPreviewActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.wallet.sendgold.SendGoldActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-
-        <!--   隐私设置    -->
+            android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- 隐私设置 -->
         <activity
             android:name=".ui.setting.PrivacySettingActivity"
-            android:screenOrientation="portrait" />
-
-        <!--   通知提醒设置    -->
+            android:screenOrientation="portrait" /> <!-- 通知提醒设置 -->
         <activity
             android:name=".ui.setting.NoticeSettingActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.login.LoginActivity"
             android:label="@string/main_androidmanifest_031"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.webview.DialogWebViewActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".ui.webview.DatingRuleWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
-
         <activity
             android:name=".ui.webview.TarotPayWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
@@ -959,50 +891,38 @@
         <activity
             android:name=".module_hall.hall.activity.SuperAdminAddActivity"
             android:screenOrientation="portrait" />
-
         <activity android:name=".module_hall.hall.activity.SuperAdminRoomSetActivity" />
-
         <activity
             android:name=".avroom.anotherroompk.RoomPKCreateActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".avroom.anotherroompk.RoomPKSearchActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".avroom.singleroompk.SingleRoomPKCreateActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".avroom.singleroompk.SingleRoomPKSearchActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".avroom.firstcharge.FirstChargeDialog"
             android:theme="@style/dialogactivity" />
-
         <activity
             android:name=".ui.setting.GrantedPermissionsActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.setting.PermissionGuideActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".vip.VipMainActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".vip.VipSettingActivity"
-            android:screenOrientation="portrait" />
-
-        <!--com.yizhuan.xchat_android_core.skill-->
+            android:screenOrientation="portrait" /> <!-- com.yizhuan.xchat_android_core.skill -->
         <activity
             android:name=".skill.activity.AddSkillActivity"
             android:screenOrientation="portrait" />
@@ -1012,7 +932,6 @@
         <activity
             android:name=".skill.activity.EditSkillActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".home.activity.VisitorListActivity"
             android:screenOrientation="portrait" />
@@ -1021,48 +940,37 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".skill.activity.SkillDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <!--CP-->
+            android:screenOrientation="portrait" /> <!-- CP -->
         <activity
             android:name=".relation.cp.activity.CpTaskActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".relation.cp.activity.CpHomeActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".relation.cp.activity.CpInviteRecordActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".fansteam.FansTeamJoinActivity"
             android:theme="@style/dialog_web_view_activity" />
-
         <activity
             android:name=".fansteam.FansTeamJoinedActivity"
             android:theme="@style/dialog_web_view_activity" />
-
         <activity
             android:name=".fansteam.FansTeamListActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".avroom.newuserchargegift.NewUserChargeGiftDialog"
             android:theme="@style/dialogactivity" />
-
         <activity
             android:name=".shipantics.PullRadishActivity"
             android:theme="@style/dialog_web_view_activity" />
-
         <activity
             android:name=".shipantics.RadishRankingActivity"
             android:theme="@style/room_message_activity" />
-
         <activity
             android:name=".AgentActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
     </application>
 
 </manifest>

app/src/main/java/com/yizhuan/erban/home/activity/AssociationActivity.java

@@ -0,0 +1,106 @@
+package com.yizhuan.erban.home.activity;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.netease.nim.uikit.StatusBarUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.base.BaseActivity;
+import com.yizhuan.erban.home.adapter.AssociationAdapter;
+import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity;
+import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo;
+import com.yizhuan.xchat_android_core.user.UserInfoUiMgr;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AssociationActivity extends BaseActivity implements SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
+    @BindView(R.id.recycler_view)
+    RecyclerView recyclerView;
+
+    private AssociationAdapter associationAdapter;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_association);
+        ButterKnife.bind(this);
+        initWhiteTitleBar(ResUtil.getString(R.string.association_list));
+        initRecyclerView();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadData();
+    }
+
+    public static void start(Context context) {
+        Intent intent = new Intent(context, AssociationActivity.class);
+        context.startActivity(intent);
+    }
+
+    private void initRecyclerView() {
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        associationAdapter = new AssociationAdapter();
+        associationAdapter.setOnItemClickListener((adapter, view, position) -> {
+            ClanListInfo info = associationAdapter.getItem(position);
+            if(info != null && info.getClanElderUid() != 0L) {
+                ModuleClanActivity.start(AssociationActivity.this, info.getClanElderUid());
+            }
+        });
+
+        recyclerView.setAdapter(associationAdapter);
+    }
+
+
+    @SuppressLint("CheckResult")
+    private void loadData() {
+        HallModel.get().getClanList()
+                .compose(bindToLifecycle())
+                .subscribe(info -> {
+                    if (ListUtils.isListEmpty(info)) {
+                        showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.association_list_empty));
+                    } else {
+                        hideStatus();
+                    }
+                    associationAdapter.setNewData(info);
+                });
+    }
+
+
+    @Override
+    public void onLoadMoreRequested() {
+
+    }
+
+    @Override
+    public void onRefresh() {
+        loadData();
+    }
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        super.setStatusBar();
+        StatusBarUtil.transparencyBar(this);
+        StatusBarUtil.StatusBarLightMode(this);
+    }
+}

app/src/main/java/com/yizhuan/erban/home/adapter/AssociationAdapter.java

@@ -0,0 +1,47 @@
+package com.yizhuan.erban.home.adapter;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo;
+
+/**
+ * Created by yudi
+ * on 2018/3/2.
+ */
+public class AssociationAdapter extends BaseQuickAdapter<ClanListInfo, BaseViewHolder> {
+
+    public AssociationAdapter() {
+        super(R.layout.item_association);
+
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, ClanListInfo item) {
+        if (helper.getAdapterPosition() == 0) {
+            helper.getView(R.id.view_guild).setVisibility(View.VISIBLE);
+            helper.getView(R.id.view_guild).setBackgroundResource(R.drawable.guild_one);
+        } else if (helper.getAdapterPosition() == 1) {
+            helper.getView(R.id.view_guild).setVisibility(View.VISIBLE);
+            helper.getView(R.id.view_guild).setBackgroundResource(R.drawable.guild_two);
+        } else if (helper.getAdapterPosition() == 2) {
+            helper.getView(R.id.view_guild).setVisibility(View.VISIBLE);
+            helper.getView(R.id.view_guild).setBackgroundResource(R.drawable.guild_three);
+        } else {
+            helper.getView(R.id.view_guild).setVisibility(View.GONE);
+            helper.getView(R.id.tv_guild).setVisibility(View.VISIBLE);
+            helper.setText(R.id.tv_guild, String.valueOf(helper.getAdapterPosition() + 1));
+        }
+
+        ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_guild_icon), item.getAvatar());
+        helper.setText(R.id.tv_name, item.getName());
+        ImageView iv_guild_image = helper.getView(R.id.iv_guild_image);
+        ImageLoadUtilsV2.loadImage(iv_guild_image, item.getLevelIcon());
+
+    }
+}

app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.text.TextUtils
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.activityViewModels
@@ -18,21 +19,28 @@ import com.yizhuan.erban.base.list.LineColorDecoration
 import com.yizhuan.erban.databinding.FragmentMeBinding
 import com.yizhuan.erban.home.HomeViewModel
 import com.yizhuan.erban.home.MeViewModel
+import com.yizhuan.erban.home.activity.AssociationActivity
 import com.yizhuan.erban.home.adapter.MeCenterAdapter
 import com.yizhuan.erban.home.helper.BannerHelper
 import com.yizhuan.erban.home.helper.OpenRoomHelper
+import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity
+import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity
 import com.yizhuan.erban.ui.pay.ChargeActivity
 import com.yizhuan.erban.ui.relation.AttentionListActivity
 import com.yizhuan.erban.ui.relation.FansListActivity
 import com.yizhuan.erban.ui.utils.ImageLoadUtils
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
 import com.yizhuan.erban.ui.utils.load
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity
 import com.yizhuan.erban.vip.VipMainActivity
 import com.yizhuan.erban.vip.VipViewModel
 import com.yizhuan.xchat_android_core.Constants
+import com.yizhuan.xchat_android_core.auth.AuthModel
 import com.yizhuan.xchat_android_core.level.UserLevelVo
 import com.yizhuan.xchat_android_core.manager.IMNetEaseManager
 import com.yizhuan.xchat_android_core.manager.RelationShipEvent
+import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo
 import com.yizhuan.xchat_android_core.pay.PayModel
 import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent
 import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent
@@ -229,11 +237,80 @@ class MeFragment : BaseFragment(), View.OnClickListener {
             FormatUtils.formatBigInteger(PayModel.get().currentWalletInfo?.diamondNum ?: 0.0)
     }
 
+    @SuppressLint("CheckResult")
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onLoginUserInfoUpdateEvent(event: LoginUserInfoUpdateEvent?) {
         setUserData()
         vipViewModel.getVipPageInfo()
         meViewModel.refreshData()
+        HallModel.get().getUserHallAndClan(AuthModel.get().currentUid)
+            .subscribe { clanAndHallInfo: ClanAndHallInfo? ->
+                this.updateHallInfo(
+                    clanAndHallInfo
+                )
+            }
+    }
+
+    private fun updateHallInfo(clanAndHallInfo: ClanAndHallInfo?) {
+        if ((clanAndHallInfo?.clan?.elderUid ?: 0L) > 0 || (clanAndHallInfo?.hall?.ownerUid
+                ?: 0L) > 0
+        ) {
+            if ((clanAndHallInfo?.clan?.elderUid ?: 0L) > 0) {
+                mBinding.ivAssociationHead.visibility = View.VISIBLE
+                mBinding.ivGuide.visibility = View.GONE
+                mBinding.tvAssociationMessage.text = getString(R.string.me_my_association)
+                mBinding.ivGuildArrow.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        mContext,
+                        R.drawable.me_association_arrow
+                    )
+                )
+                ImageLoadUtilsV2.loadAvatar(
+                    mBinding.ivAssociationHead,
+                    clanAndHallInfo?.clan?.avatar
+                )
+            } else if ((clanAndHallInfo?.hall?.ownerUid ?: 0L) > 0) {
+                mBinding.ivAssociationHead.visibility = View.VISIBLE
+                mBinding.ivGuide.visibility = View.GONE
+                mBinding.tvAssociationMessage.text = getString(R.string.me_my_association)
+                mBinding.ivGuildArrow.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        mContext,
+                        R.drawable.me_association_arrow
+                    )
+                )
+                ImageLoadUtilsV2.loadAvatar(
+                    mBinding.ivAssociationHead,
+                    clanAndHallInfo?.hall?.ownerAvatar
+                )
+            }
+            mBinding.llAssociation.setOnClickListener {
+                if ((clanAndHallInfo?.clan?.elderUid ?: 0L) > 0) {
+                    ModuleClanActivity.start(context, clanAndHallInfo?.clan?.elderUid ?: 0L)
+                } else if ((clanAndHallInfo?.hall?.ownerUid ?: 0L) > 0) {
+                    ModuleHallActivity.start(
+                        context,
+                        clanAndHallInfo?.hall?.hallId ?: 0L,
+                        clanAndHallInfo?.hall?.ownerUid ?: 0L,
+                        clanAndHallInfo?.clan?.elderUid ?: 0L
+                    )
+                }
+            }
+        } else {
+            mBinding.ivAssociationHead.visibility = View.GONE
+            mBinding.ivGuide.visibility = View.VISIBLE
+            mBinding.tvAssociationMessage.text = getString(R.string.me_join_guild)
+            mBinding.ivGuildArrow.setImageDrawable(
+                ContextCompat.getDrawable(
+                    mContext,
+                    R.drawable.me_association_add
+                )
+            )
+            mBinding.llAssociation.setOnClickListener {
+                //公會周榜
+                AssociationActivity.start(context)
+            }
+        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -294,7 +371,10 @@ class MeFragment : BaseFragment(), View.OnClickListener {
             R.id.ll_room -> {
                 //我的房间,开房
                 StatisticManager.Instance()
-                    .onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, ResUtil.getString(R.string.home_fragment_mefragment_01))
+                    .onEvent(
+                        StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK,
+                        ResUtil.getString(R.string.home_fragment_mefragment_01)
+                    )
                 OpenRoomHelper.openRoom(context as BaseActivity?)
             }
             R.id.ll_gain -> {

app/src/main/java/com/yizhuan/erban/vip/VipViewModel.kt

@@ -5,6 +5,9 @@ import androidx.lifecycle.MutableLiveData
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewModel
 import com.yizhuan.xchat_android_core.bean.response.BeanResult
+import com.yizhuan.xchat_android_core.home.model.HomeModel
+import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
+import com.yizhuan.xchat_android_core.user.UserInfoUiMgr
 import com.yizhuan.xchat_android_core.user.UserModel
 import com.yizhuan.xchat_android_core.utils.toast
 import com.yizhuan.xchat_android_core.vip.VipAuthInfo
@@ -14,7 +17,9 @@ import com.yizhuan.xchat_android_core.vip.VipModel
 import com.yizhuan.xchat_android_library.utils.ResUtil
 
 class VipViewModel : BaseViewModel() {
-
+    val userId: Long by lazy {
+        UserInfoUiMgr.get().uid
+    }
 
     private val _authInfosLiveData = MutableLiveData<List<VipAuthInfo>>()
     val authInfosLiveData: LiveData<List<VipAuthInfo>> = _authInfosLiveData
@@ -43,6 +48,9 @@ class VipViewModel : BaseViewModel() {
     private val _enterHideLiveData = MutableLiveData<Boolean>()
     val enterHideLiveData: LiveData<Boolean> = _enterHideLiveData
 
+//    private val _sendBroadcastLiveData = MutableLiveData<Boolean>()
+//    val sendBroadcastLiveData: LiveData<Boolean> = _sendBroadcastLiveData
+
     fun getVipPageInfo() {
         safeLaunch(
             true,
@@ -80,6 +88,21 @@ class VipViewModel : BaseViewModel() {
 
     }
 
+    /**
+     * 获取用户家族和公会信息,不一定是自己的
+     * 特别注意,这里的HallInfo里面是没有RoleType的
+     */
+//    fun getUserHallAndClan() {
+//        safeLaunch (
+//            onError = {
+//                _homeLiveTopInfoLiveData.value = null
+//            },
+//            block = {
+//                _homeLiveTopInfoLiveData.value = HallModel.get().getUserHallAndClan(userId)
+//            }
+//        )
+//    }
+
     fun saveOriginDisguise() {
         safeLaunch(
             true,

app/src/main/res/layout/activity_association.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".home.activity.AssociationActivity">
+
+    <com.yizhuan.erban.base.TitleBar
+        android:id="@+id/title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_30" />
+
+    <com.yizhuan.erban.common.widget.StatusLayout
+        android:id="@+id/status_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </com.yizhuan.erban.common.widget.StatusLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/activity_user_info.xml

@@ -283,7 +283,7 @@
                                         android:includeFontPadding="false"
                                         android:singleLine="true"
                                         android:textColor="@color/white"
-                                        android:textSize="11dp"
+                                        android:textSize="11sp"
                                         app:layout_constraintBottom_toBottomOf="parent"
                                         app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
                                         app:layout_constraintStart_toStartOf="@id/iv_official_mask"
@@ -295,7 +295,7 @@
                                 <TextView
                                     android:id="@+id/tv_constellation"
                                     android:layout_width="wrap_content"
-                                    android:layout_height="18dp"
+                                    android:layout_height="@dimen/dp_13"
                                     android:layout_gravity="center_vertical"
                                     android:layout_marginStart="5dp"
                                     android:background="@drawable/shape_58559d"
@@ -410,7 +410,7 @@
                     android:id="@+id/fl_indicator"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="20dp"
+                    android:paddingTop="15dp"
                     android:paddingBottom="5dp">
 
                     <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
@@ -428,7 +428,7 @@
                 android:id="@+id/view_pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/dp_14"
+                android:layout_marginTop="@dimen/dp_5"
                 android:layout_marginBottom="@dimen/dp_60"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 

app/src/main/res/layout/dialog_share.xml

@@ -56,6 +56,7 @@
                 android:text="@string/text_share_erban_friends"
                 android:textColor="@color/color_999999"
                 android:textSize="@dimen/font_medium"
+                android:visibility="gone"
                 app:drawableTopCompat="@drawable/icon_erban_friends" />
 
             <TextView

app/src/main/res/layout/fragment_me.xml

@@ -463,14 +463,23 @@
                     android:layout_height="@dimen/dp_30"
                     android:layout_marginStart="@dimen/dp_18"
                     android:onClick="@{click}"
+                    android:visibility="gone"
                     android:src="@drawable/default_avatar" />
 
+                <ImageView
+                    android:id="@+id/iv_guide"
+                    android:src="@drawable/icon_guild"
+                    android:layout_marginStart="@dimen/dp_18"
+                    android:visibility="visible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
                 <TextView
                     android:id="@+id/tv_association_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_12"
-                    android:text="@string/me_my_association"
+                    android:text="@string/me_join_guild"
                     android:textColor="@color/color_EEA473"
                     android:textSize="@dimen/sp_15"
                     android:textStyle="bold" />
@@ -481,10 +490,11 @@
                     android:layout_weight="1" />
 
                 <ImageView
+                    android:id="@+id/iv_guild_arrow"
                     android:layout_width="28dp"
                     android:layout_height="28dp"
                     android:layout_marginEnd="@dimen/dp_18"
-                    android:src="@drawable/me_association_arrow" />
+                    android:src="@drawable/me_association_add" />
 
             </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -845,7 +845,7 @@
     <string name="qq_login">QQ登錄</string>
     <string name="hint_input_nick">請輸入昵稱</string>
     <string name="text_bind_phone">綁定手機號</string>
-    <string name="slogan">來&app_name;，快樂不止遊戲</string>
+    <string name="slogan">來&app_name;，邂逅你的專屬聲音</string>
 
     <string name="text_agree">同意</string>
     <string name="text_disagree">不同意</string>
@@ -915,7 +915,7 @@
     <string name="text_dating_vip_rule">1.每輪相親在「嘉賓交流」階段累積送禮滿999鉆石且送禮價值最高的用戶自動登上VIP席位；\n\n 2.若出現多個滿足上VIP席位要求的用戶，VIP席位最終由送禮價值最高的用戶獲得，若送禮價值相同以最先達到該值的用戶為準；\n\n 3.VIP席位的用戶可選擇是否下麥，其他用戶不可因此代替坐上席位； \n\n 4.用戶只能在「嘉賓交流」階段搶奪VIP席位，「嘉賓交流」階段後直到結束本輪前，即使送出超過之前VIP總禮物價值也不能換人；\n\n 5.每輪相親結束後VIP席位清空，下一輪重新開始搶位。</string>
     <string name="room_pk_help">1)按收到的禮物價值積分（1鉆石=1分），禮物值高的一方獲勝。\n 2)PK結束後，若比分差距≥1314或雙方分數總值≥15000（平局除外）將在與獲勝方相同類型的房間公示PK結果；若比分差距≥5200或雙方分數總值≥30000（平局除外）將在全服所有房間公示PK結果。</string>
     <string name="room_pk_rule">1)只有牌照房房主和超管才可以發起跨房pk，一次只能選擇一個牌照房發起；\n 2)只有房主和超管才可以接受或拒絕跨房pk請求，若10秒內不點擊pk邀請彈窗，彈窗消失，視為自動拒絕；\n 3)發起pk時需選擇pk時間和pk對象，自定義時間下限為5，上限為180，只能填寫整數；\n 4)pk發起後，未到pk時間無法自行結束，若有特殊情況需提前結束可聯系客服，但本場pk不算勝負。</string>
-    <string name="first_charge_help">1.每人僅可獲得1次首充福利\n2.每個手機號，設備，實名認證等如已參與過首充，則無法獲得獎勵。</string>
+    <string name="first_charge_help">1.每人僅可獲得1次首充福利\n2.每個ID、設備僅能參加一次</string>
     <string name="home_like_hint">關註的人和收藏的房間都會出現在這裏\n暫無關註的人和收藏的房間哦</string>
     <string name="avatar_auditing">頭像已送審，審核成功後自動應用頭像</string>
     <string name="vip_time_desc">剩余時間以30天為周期，以獲得新的貴族等級次日起算30日後的中午12:00為截止時間，周期內貴族等級出現變化則剩余時間自動重置為30天。</string>
@@ -961,6 +961,7 @@
     <string name="me_noble_center">貴族中心</string>
     <string name="me_open_various_privileges">開通立享各項特權</string>
     <string name="me_my_association">我的公會</string>
+    <string name="me_join_guild">加入公會</string>
     <string name="me_personal_center">個人中心</string>
     <string name="me_my_room">我的房間</string>
     <string name="me_gain_recording">收益記錄</string>
@@ -4902,5 +4903,7 @@
     <string name="extender_room_party">房間派對</string>
     <string name="create_home_play">快來創建房間一起開黑吧~</string>
     <string name="share_link">複製鏈接</string>
+    <string name="association_list">公會周榜</string>
+    <string name="association_list_empty">還沒有公會榜單哦</string>
 
 </resources>

app/src/module_bank_card/res/layout/item_association.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cl_root"
+    android:gravity="center_vertical"
+    android:layout_marginTop="@dimen/dp_18"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_width="22dp"
+        android:layout_height="wrap_content">
+
+        <View
+            android:id="@+id/view_guild"
+            android:background="@drawable/guild_one"
+            android:layout_width="@dimen/dp_22"
+            android:layout_height="@dimen/dp_22"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_guild"
+            tools:text="1"
+            android:textSize="@dimen/sp_16"
+            android:textColor="@color/color_1F1A4E"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    
+    <com.yizhuan.erban.common.widget.CircleImageView
+        android:id="@+id/iv_guild_icon"
+        android:src="@drawable/default_avatar"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"/>
+
+    <TextView
+        android:id="@+id/tv_name"
+        tools:text="公會名稱"
+        android:textSize="@dimen/sp_15"
+        android:textColor="@color/color_1F1A4E"
+        android:textStyle="bold"
+        android:layout_marginStart="@dimen/dp_8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+
+    <ImageView
+        android:id="@+id/iv_guild_image"
+        android:layout_marginEnd="@dimen/dp_16"
+        android:layout_width="30dp"
+        android:layout_height="30dp"/>
+
+</LinearLayout>

app/src/module_community/res/layout/item_square_dynamic.xml

@@ -248,6 +248,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/ll_comment"
+            android:visibility="gone"
             android:paddingStart="@dimen/dp_5"
             android:paddingEnd="0dp">
 

app/src/module_labour_union/res/layout/activity_module_clan.xml

@@ -135,6 +135,7 @@
                     android:background="@drawable/bg_single_room_income"
                     android:paddingStart="10dp"
                     android:paddingTop="10dp"
+                    android:visibility="gone"
                     android:text="@string/layout_activity_module_clan_05"
                     android:textColor="@color/white"
                     android:textSize="14sp" />

core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java

@@ -1,7 +1,12 @@
 package com.yizhuan.xchat_android_core.share;
 
 import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.util.Log;
 
+import com.netease.nim.uikit.common.util.sys.ClipboardUtil;
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 import com.yizhuan.xchat_android_core.R;
@@ -18,6 +23,7 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.yizhuan.xchat_android_core.utils.Logger;
 import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo;
 import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
@@ -145,15 +151,24 @@ public class ShareModel extends BaseModel implements IShareModel {
             public void subscribe(SingleEmitter<String> emitter) throws Exception {
                 //无UI API
                 if (platform != null) {
-
-                    Platform.ShareParams sp = new Platform.ShareParams();
-                    sp.setImageUrl(room_avatar);
-
+                    String name = platform.getName();
                     final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL +
                             AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" +
                             URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" +
                             URLEncoder.encode(room_avatar, "utf8") + "&share_name=" +
                             URLEncoder.encode(UserModel.get().getCacheLoginUserInfo().getNick(), "utf8");
+                    if (name.equals("GooglePlus")) {
+                        try {
+                            ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                            cm.setPrimaryClip(ClipData.newPlainText("text", siteUrl));
+                            emitter.onSuccess("已複製");
+                        } catch (Exception e) {
+                            Logger.info("copyText", String.valueOf(e));
+                            emitter.onError(new Throwable(String.valueOf(e)));
+                        }
+                    } else {
+                        Platform.ShareParams sp = new Platform.ShareParams();
+                        sp.setImageUrl(room_avatar);
 
                         //facebook
                         if (platform.getName().equals(Facebook.NAME)) {
@@ -192,6 +207,7 @@ public class ShareModel extends BaseModel implements IShareModel {
                         platform.share(sp);
                     }
                 }
+            }
         });
     }
 

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java

@@ -10,6 +10,7 @@ import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthListResult;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallMenuByUidResult;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo;
@@ -291,6 +292,12 @@ public class HallModel extends BaseModel implements IHallModel {
                 .compose(RxHelper.handleCommon());
     }
 
+    @Override
+    public Single<List<ClanListInfo>> getClanList() {
+        return api.getClanList()
+                .compose(RxHelper.handleCommon());
+    }
+
     @Override
     public Single<List<SuperAdminHall>> getSuperAdminHallList(long clanId, long uid) {
         return api.getSuperAdminHallList(clanId, uid)
@@ -488,6 +495,12 @@ public class HallModel extends BaseModel implements IHallModel {
         @GET("/clan/getUserHallAndClan")
         Single<ServiceResult<ClanAndHallInfo>> getUserHallAndClan(@Query("uid") long uid);
 
+        /**
+         * 获取公會周榜
+         */
+        @GET("/clan/listRank")
+        Single<ServiceResult<List<ClanListInfo>>> getClanList();
+
         /**
          * 获取设置超管可以管理的房间列表
          */

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java

@@ -4,6 +4,8 @@ package com.yizhuan.xchat_android_core.module_hall.hall;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
+import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo;
@@ -76,6 +78,8 @@ public interface IHallModel {
 
     Single<ClanAndHallInfo> getUserHallAndClan(long uid);
 
+    Single<List<ClanListInfo>> getClanList();
+
     Single<List<SuperAdminHall>> getSuperAdminHallList(long clanId, long uid);
 
     Single<SuperAdminInfo> searchSuperAdminInfo(long erbanNo);

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanListInfo.java

@@ -0,0 +1,14 @@
+package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+
+import lombok.Data;
+
+@Data
+public class ClanListInfo {
+    private int clanId;
+    private long clanElderUid;
+    private String avatar;
+    private String name;
+    private String levelIcon;
+    private double income;
+    private int level;
+}