yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改消息中心红点

Browse Source
This commit is contained in:
18401019693 2022-09-06 18:18:17 +08:00
parent 8f0538724f
commit 2bc5c8aeb6
3 changed files with 215 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

416
common/src/main/res/layout/view_live_total.xml
View File

@ -30,152 +30,154 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="10dp">
<LinearLayout
android:id="@+id/popular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<ImageView android:scrollbars="none">
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_moods" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/popular_tickets"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/fan_club" android:layout_width="match_parent"
android:layout_marginStart="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_marginStart="16dp"
android:orientation="vertical"> android:layout_marginTop="10dp"
android:paddingEnd="16dp">
<ImageView <LinearLayout
android:layout_width="40dp" android:id="@+id/popular"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_fans" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:gravity="center"
android:text="@string/fan_club" android:orientation="vertical">
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout> <ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_moods" />
<LinearLayout <TextView
android:id="@+id/guard_layout" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="6dp"
android:layout_marginStart="28dp" android:text="@string/popular_tickets"
android:gravity="center" android:textColor="#FF9A9A9A"
android:orientation="vertical"> android:textSize="12sp" />
<ImageView </LinearLayout>
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_guard" />
<TextView <LinearLayout
android:id="@+id/fan_club"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="28dp"
android:text="@string/guard_guard" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout> <ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_fans" />
<LinearLayout <TextView
android:id="@+id/noble_layout" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="6dp"
android:layout_marginStart="28dp" android:text="@string/fan_club"
android:gravity="center" android:textColor="#FF9A9A9A"
android:orientation="vertical"> android:textSize="12sp" />
<ImageView </LinearLayout>
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_aristocrat" />
<TextView <LinearLayout
android:id="@+id/guard_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="28dp"
android:text="@string/noble" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <ImageView
android:id="@+id/live_wks_layout" android:layout_width="40dp"
android:layout_width="wrap_content" android:layout_height="40dp"
android:layout_height="wrap_content" android:src="@mipmap/live_more_icon_guard" />
android:layout_marginStart="28dp"
android:gravity="center"
android:orientation="vertical">
<ImageView <TextView
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:src="@mipmap/live_more_icon_zhouxinglist" /> android:layout_marginTop="6dp"
android:text="@string/guard_guard"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
<TextView </LinearLayout>
<LinearLayout
android:id="@+id/noble_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="28dp"
android:text="@string/live_wks" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_aristocrat" />
</LinearLayout> <TextView
<LinearLayout android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginTop="6dp"
android:layout_marginTop="10dp" android:text="@string/noble"
android:orientation="horizontal" android:textColor="#FF9A9A9A"
android:layout_height="wrap_content"> android:textSize="12sp" />
<LinearLayout </LinearLayout>
android:id="@+id/activity_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView <LinearLayout
android:layout_width="40dp" android:id="@+id/live_wks_layout"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_events" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="28dp"
android:text="@string/activity_center" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout> <ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_zhouxinglist" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/live_wks"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/activity_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:orientation="vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_events" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/activity_center"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</HorizontalScrollView>
</LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -186,122 +188,130 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="10dp" android:scrollbars="none">
android:layout_marginBottom="20dp">
<LinearLayout <LinearLayout
android:id="@+id/live_link_mic" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_marginStart="16dp"
android:orientation="vertical"> android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
android:paddingEnd="16dp">
<ImageView <LinearLayout
android:layout_width="40dp" android:id="@+id/live_link_mic"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_connect" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:gravity="center"
android:text="@string/live_link_mic_2" android:orientation="vertical">
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <ImageView
android:id="@+id/effects_settings_layout" android:layout_width="40dp"
android:layout_width="wrap_content" android:layout_height="40dp"
android:layout_height="wrap_content" android:src="@mipmap/live_more_icon_connect" />
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical">
<ImageView <TextView
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:src="@mipmap/live_more_icon_special" /> android:layout_marginTop="6dp"
android:text="@string/live_link_mic_2"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<TextView <LinearLayout
android:id="@+id/effects_settings_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="23dp"
android:text="@string/effects_settings" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <ImageView
android:id="@+id/system_notice" android:layout_width="40dp"
android:layout_width="wrap_content" android:layout_height="40dp"
android:layout_height="wrap_content" android:src="@mipmap/live_more_icon_special" />
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical">
<ImageView <TextView
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:src="@mipmap/live_more_icon_system" /> android:layout_marginTop="6dp"
android:text="@string/effects_settings"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<TextView <LinearLayout
android:id="@+id/system_notice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="23dp"
android:text="@string/system_notice" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <ImageView
android:id="@+id/online" android:layout_width="40dp"
android:layout_width="wrap_content" android:layout_height="40dp"
android:layout_height="wrap_content" android:src="@mipmap/live_more_icon_system" />
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical">
<ImageView <TextView
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:src="@mipmap/live_more_icon_service" /> android:layout_marginTop="6dp"
android:text="@string/system_notice"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<TextView <LinearLayout
android:id="@+id/online"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="23dp"
android:text="@string/online_service" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <ImageView
android:id="@+id/report_layout" android:layout_width="40dp"
android:layout_width="wrap_content" android:layout_height="40dp"
android:layout_height="wrap_content" android:src="@mipmap/live_more_icon_service" />
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical">
<ImageView <TextView
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:src="@mipmap/live_more_icon_report" /> android:layout_marginTop="6dp"
android:text="@string/online_service"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<TextView <LinearLayout
android:id="@+id/report_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="23dp"
android:text="@string/report" android:gravity="center"
android:textColor="#FF9A9A9A" android:orientation="vertical">
android:textSize="12sp" />
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_report" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/report"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </HorizontalScrollView>
</LinearLayout> </LinearLayout>

2
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -177,7 +177,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private boolean isWebClose = false; private boolean isWebClose = false;
public static boolean isTabClose = false; public static boolean isTabClose = false;
private boolean isFirstOpen = true; private boolean isFirstOpen = true;
private int messageNumber = 0, numberMe = 1; private int messageNumber = 0, numberMe = 0;
private ImageView waitingTip; private ImageView waitingTip;
private FloatBannerView floatBanner; private FloatBannerView floatBanner;
private boolean isfloatBannernet = true, isFirst = true; private boolean isfloatBannernet = true, isFirst = true;

3
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@ -243,7 +243,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
Bundle bundle = getIntent().getExtras(); Bundle bundle = getIntent().getExtras();
if (bundle != null) { if (bundle != null) {
int messageNumber = bundle.getInt(MESSAGENUMBER, 0); int messageNumber = bundle.getInt(MESSAGENUMBER, 0);
int numberMe = bundle.getInt(NUMBERME, 1); int numberMe = bundle.getInt(NUMBERME, 0);
onMessageIMEvent(new MessageIMEvent().setNumber(messageNumber)); onMessageIMEvent(new MessageIMEvent().setNumber(messageNumber));
onUpdateFieldEvent(new UpdateTablePointMe(numberMe)); onUpdateFieldEvent(new UpdateTablePointMe(numberMe));
} }
@ -526,7 +526,6 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
} }
//红点(我的) //红点(我的)
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdateFieldEvent(UpdateTablePointMe updateTablePointMe) { public void onUpdateFieldEvent(UpdateTablePointMe updateTablePointMe) {
if (redpointMe == null) return; if (redpointMe == null) return;
if (updateTablePointMe.getPoint() == 0) { if (updateTablePointMe.getPoint() == 0) {