bugfix

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

@@ -60,7 +60,7 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
                 livingIconView.setColor(Color.WHITE);
                 livingIconView.start();
                 helper.setText(R.id.tv_online_number,item.getOnlineNum()+"")
-                        .setText(R.id.tv_title, item.getRoomTitle());
+                        .setText(R.id.tv_title, item.getTitle());
 //        helper.getView(R.id.lock_bg).setVisibility(!TextUtils.isEmpty(homeRoom.getRoomPwd()) ? View.VISIBLE : View.GONE);
 
                 helper.setGone(R.id.iv_tab_label, mIsHome);

app/src/main/java/com/yizhuan/erban/home/bean/HomeTabMapInfo.java

@@ -17,7 +17,7 @@ public class HomeTabMapInfo implements MultiItemEntity, Serializable {
 
         private int onlineNum;
         private int roomUid;
-        private String roomTitle;
+        private String title;
         private String avatar;
         private int seq;
         private boolean isTop;
@@ -59,15 +59,15 @@ public class HomeTabMapInfo implements MultiItemEntity, Serializable {
             this.roomUid = roomUid;
         }
 
-        public String getRoomTitle() {
-            return roomTitle;
-        }
+    public String getTitle() {
+        return title;
+    }
 
-        public void setRoomTitle(String roomTitle) {
-            this.roomTitle = roomTitle;
-        }
+    public void setTitle(String title) {
+        this.title = title;
+    }
 
-        public String getAvatar() {
+    public String getAvatar() {
             return avatar;
         }
 

app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java

@@ -42,15 +42,10 @@ public class AttentionListAdapter extends BaseQuickAdapter<AttentionInfo, BaseVi
                         attentionInfo.getUserDesc()
                         : baseViewHolder.itemView.getContext().getResources().getString(R.string.msg_no_user_desc))
                 .setGone(R.id.tv_find_him, attentionInfo.getUserInRoom() != null && type == AbstractSelectFriendAction.TYPE_NORMAL)
-                .setGone(R.id.tv_send, isSend)
                 .setOnClickListener(R.id.tv_find_him, v -> {
                     if (rylListener != null)
                         rylListener.findHimListeners(attentionInfo);
                 })
-                .setOnClickListener(R.id.tv_send, v -> {
-                    if (rylListener != null)
-                        rylListener.sendListener(attentionInfo);
-                })
                 .setOnClickListener(R.id.rly, v -> {
                     if (rylListener != null)
                         switch (type) {

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java

@@ -541,21 +541,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 break;
 
             case R.id.iv_where:
-//                getDialogManager().showProgressDialog(this, "请稍后...");
-//                AvRoomModel.get()
-//                        .getUserRoom(Long.parseLong(mRoomUid))
-//                        .compose(bindToLifecycle())
-//                        .subscribe((roomResult, throwable) -> {
-//                            if (throwable != null) {
-//                                onGetUserRoomFail(throwable.getMessage());
-//                            } else if (roomResult != null && roomResult.isSuccess()) {
-//                                onGetUserRoom(roomResult.getData());
-//                            } else if (roomResult != null && !roomResult.isSuccess()) {
-//                                onGetUserRoomFail(roomResult.getError());
-//                            } else {
-//                                onGetUserRoomFail("未知错误");
-//                            }
-//                        });
                 AVRoomActivity.start(this, Long.parseLong(mRoomUid));
                 break;
 

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

@@ -133,17 +133,7 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/tv_send"
-            android:layout_width="55dp"
-            android:layout_height="25dp"
-            android:background="@drawable/bg_car_item_buy"
-            android:gravity="center"
-            android:text="@string/send_gift"
-            android:textColor="@color/color_FFFFFF"
-            android:textSize="13sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+
 
     </FrameLayout>
 

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

@@ -100,7 +100,7 @@
                     android:id="@+id/app_bar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@null"
+                    android:background="@color/transparent"
                     android:theme="@style/AppTheme.AppBarOverlay"
                     app:expanded="false"
                     tools:expanded="true"

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

@@ -27,7 +27,7 @@
         android:background="@drawable/bg_common_confirm_normal"
         android:paddingLeft="@dimen/dp_5"
         android:paddingRight="@dimen/dp_5"
-        android:text="嗨聊中"/>
+        android:text="直播中"/>
 
     <TextView
         android:id="@+id/tv_name_attention_in_room"

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

@@ -55,7 +55,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
-            android:text="嗨聊中"
+            android:text="直播中"
             android:textColor="@color/color_999999"
             android:textSize="11sp" />
     </LinearLayout>