修复:
優化UI
This commit is contained in:
parent
e181fbf0d2
commit
5a6e6a5dc4
@ -111,6 +111,15 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
|
|||||||
mFooter.setTextSizeTitle(14);
|
mFooter.setTextSizeTitle(14);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置头部字体颜色
|
||||||
|
*
|
||||||
|
* @param textColor
|
||||||
|
*/
|
||||||
|
public void setHeaderTextColor(int textColor) {
|
||||||
|
mHeader.setAccentColor(textColor);
|
||||||
|
}
|
||||||
|
|
||||||
private HttpCallback mRefreshCallback = new HttpCallback() {
|
private HttpCallback mRefreshCallback = new HttpCallback() {
|
||||||
|
|
||||||
private int mDataCount;
|
private int mDataCount;
|
||||||
@ -295,7 +304,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
|
|||||||
* 手动设置没有更多数据
|
* 手动设置没有更多数据
|
||||||
* 因为日榜/周榜接口没有分页参数,会导致一直读取重复数据
|
* 因为日榜/周榜接口没有分页参数,会导致一直读取重复数据
|
||||||
*/
|
*/
|
||||||
public void setNotLoadMore(){
|
public void setNotLoadMore() {
|
||||||
mSmartRefreshLayout.finishLoadMoreWithNoMoreData();
|
mSmartRefreshLayout.finishLoadMoreWithNoMoreData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,10 +21,9 @@
|
|||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/live_type"
|
android:id="@+id/live_type"
|
||||||
android:layout_width="46dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="18dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="4dp"
|
android:layout_margin="4dp"
|
||||||
android:scaleType="centerCrop"
|
|
||||||
android:gravity="center" />
|
android:gravity="center" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -76,7 +76,6 @@
|
|||||||
<string name="completing_mission">completing mission</string>
|
<string name="completing_mission">completing mission</string>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<string name="apply_for_lianmai">ApplyMic</string>
|
<string name="apply_for_lianmai">ApplyMic</string>
|
||||||
<string name="cancel_application">Cancel Mic</string>
|
<string name="cancel_application">Cancel Mic</string>
|
||||||
<string name="quit_mic">Quit Mic</string>
|
<string name="quit_mic">Quit Mic</string>
|
||||||
@ -862,4 +861,12 @@ Limited ride And limited avatar frame</string>
|
|||||||
<string name="anchor_more">More</string>
|
<string name="anchor_more">More</string>
|
||||||
<string name="wonderful_live">Wonderful live</string>
|
<string name="wonderful_live">Wonderful live</string>
|
||||||
<string name="recommended_for_you">recommended for you</string>
|
<string name="recommended_for_you">recommended for you</string>
|
||||||
|
<string name="fun_games">fun games</string>
|
||||||
|
<string name="value_added_benefits">value added benefits</string>
|
||||||
|
<string name="fan_club">fan club</string>
|
||||||
|
<string name="activity_center">activity center</string>
|
||||||
|
<string name="basic_tools">basic tools</string>
|
||||||
|
<string name="effects_settings">effects settings</string>
|
||||||
|
<string name="shield_gift_effect">shield gift effect</string>
|
||||||
|
<string name="shield_mount_effect">shield mount effect</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -880,6 +880,6 @@
|
|||||||
<string name="activity_center">活動中心</string>
|
<string name="activity_center">活動中心</string>
|
||||||
<string name="basic_tools">基础工具</string>
|
<string name="basic_tools">基础工具</string>
|
||||||
<string name="effects_settings">特效設置</string>
|
<string name="effects_settings">特效設置</string>
|
||||||
<string name="shield_gift_effect">屏蔽礼物特效</string>
|
<string name="shield_gift_effect">屏蔽禮物特效</string>
|
||||||
<string name="shield_mount_effect">屏蔽坐骑特效</string>
|
<string name="shield_mount_effect">屏蔽坐騎特效</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -257,6 +257,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//获取直播间状态
|
//获取直播间状态
|
||||||
private Runnable liveRunnable = new Runnable() {
|
private Runnable liveRunnable = new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@ -618,8 +619,6 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
bundle.putInt("LiveBg", liveBg);
|
bundle.putInt("LiveBg", liveBg);
|
||||||
sidebarLiveAudience.setArguments(bundle);
|
sidebarLiveAudience.setArguments(bundle);
|
||||||
sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience");
|
sidebarLiveAudience.show(getSupportFragmentManager(), "SidebarLiveAudience");
|
||||||
// manager.openDrawer();
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case BOTTOM_COLLECTION:
|
case BOTTOM_COLLECTION:
|
||||||
LiveTotalDialog liveTotalDialog = new LiveTotalDialog();
|
LiveTotalDialog liveTotalDialog = new LiveTotalDialog();
|
||||||
@ -742,6 +741,10 @@ public class LiveAudienceActivity extends LiveActivity {
|
|||||||
mLiveGuardInfo : event.getParametersModel().getmLiveGuardInfo();
|
mLiveGuardInfo : event.getParametersModel().getmLiveGuardInfo();
|
||||||
liveBg = TextUtils.equals(String.valueOf(liveBg), String.valueOf(event.getParametersModel().getLiveBg())) ?
|
liveBg = TextUtils.equals(String.valueOf(liveBg), String.valueOf(event.getParametersModel().getLiveBg())) ?
|
||||||
liveBg : event.getParametersModel().getLiveBg();
|
liveBg : event.getParametersModel().getLiveBg();
|
||||||
|
is_fans = TextUtils.equals(String.valueOf(is_fans), String.valueOf(event.getParametersModel().getIs_fans())) ?
|
||||||
|
is_fans : event.getParametersModel().getIs_fans();
|
||||||
|
fansNum = TextUtils.equals(String.valueOf(fansNum), String.valueOf(event.getParametersModel().getFansNum())) ?
|
||||||
|
fansNum : event.getParametersModel().getFansNum();
|
||||||
break;
|
break;
|
||||||
case ACTIVITY_CENTER://活动中心
|
case ACTIVITY_CENTER://活动中心
|
||||||
String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky";
|
String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky";
|
||||||
|
@ -16,6 +16,26 @@ public class OpenParametersModel extends BaseModel {
|
|||||||
private int mLiveTypeVal = 0;
|
private int mLiveTypeVal = 0;
|
||||||
private LiveGuardInfo mLiveGuardInfo = null;
|
private LiveGuardInfo mLiveGuardInfo = null;
|
||||||
private int liveBg = 0;
|
private int liveBg = 0;
|
||||||
|
private int fansNum;
|
||||||
|
private String is_fans;
|
||||||
|
|
||||||
|
public int getFansNum() {
|
||||||
|
return fansNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OpenParametersModel setFansNum(int fansNum) {
|
||||||
|
this.fansNum = fansNum;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getIs_fans() {
|
||||||
|
return is_fans;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OpenParametersModel setIs_fans(String is_fans) {
|
||||||
|
this.is_fans = is_fans;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public int getLiveBg() {
|
public int getLiveBg() {
|
||||||
return liveBg;
|
return liveBg;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.yunbao.live.dialog;
|
package com.yunbao.live.dialog;
|
||||||
|
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.view.Display;
|
import android.view.Display;
|
||||||
@ -94,6 +95,7 @@ public class SidebarLiveAudience extends AbsDialogFragment {
|
|||||||
|
|
||||||
}
|
}
|
||||||
sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList);
|
sidebarList = (CommonRefreshView) findViewById(R.id.sidebarList);
|
||||||
|
// sidebarList.setHeaderTextColor(Color.parseColor("#50ffffff"));
|
||||||
GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false);
|
GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false);
|
||||||
gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
|
gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -1180,7 +1180,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
}
|
}
|
||||||
Bus.get().post(new LiveAudienceEvent()
|
Bus.get().post(new LiveAudienceEvent()
|
||||||
.setType(LiveAudienceEvent.LiveAudienceType.OPEN_PARAMETERS)
|
.setType(LiveAudienceEvent.LiveAudienceType.OPEN_PARAMETERS)
|
||||||
.setParametersModel(new OpenParametersModel().setmLiveGuardInfo(mLiveGuardInfo)));
|
.setParametersModel(new OpenParametersModel().setmLiveGuardInfo(mLiveGuardInfo)
|
||||||
|
.setFansNum(fansNum)
|
||||||
|
.setIs_fans(is_fans)));
|
||||||
if (mLiveRoomViewHolder != null) {
|
if (mLiveRoomViewHolder != null) {
|
||||||
mLiveRoomViewHolder.setGuardNum(guardNum);
|
mLiveRoomViewHolder.setGuardNum(guardNum);
|
||||||
mLiveRoomViewHolder.setFansNum(fansNum);
|
mLiveRoomViewHolder.setFansNum(fansNum);
|
||||||
|
@ -232,6 +232,7 @@
|
|||||||
android:layout_height="30dp"
|
android:layout_height="30dp"
|
||||||
android:layout_marginStart="6dp"
|
android:layout_marginStart="6dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginEnd="10dp"
|
||||||
android:src="@mipmap/icon_live_close_3" />
|
android:src="@mipmap/icon_live_close_3" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
Loading…
Reference in New Issue
Block a user