diff --git a/common/src/main/res/layout/view_live_total.xml b/common/src/main/res/layout/view_live_total.xml index a9464fad4..5e7855974 100644 --- a/common/src/main/res/layout/view_live_total.xml +++ b/common/src/main/res/layout/view_live_total.xml @@ -30,152 +30,154 @@ android:textColor="@color/white" android:textSize="14sp" /> - - - - - - - + android:scrollbars="none"> + android:layout_marginStart="16dp" + android:layout_marginTop="10dp" + android:paddingEnd="16dp"> - - - + android:gravity="center" + android:orientation="vertical"> - + - + - + - + android:layout_marginStart="28dp" + android:gravity="center" + android:orientation="vertical"> - + - + - + - - + android:layout_marginStart="28dp" + android:gravity="center" + android:orientation="vertical"> - + - + - + + - + android:layout_marginStart="28dp" + android:gravity="center" + android:orientation="vertical"> + - - - + + - - - - + android:layout_marginStart="28dp" + android:gravity="center" + android:orientation="vertical"> + + + + + + + + + + + + + + - - + + android:scrollbars="none"> + android:layout_marginStart="16dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="20dp" + android:paddingEnd="16dp"> - - - - + android:gravity="center" + android:orientation="vertical"> - + - + + - - + android:layout_marginStart="23dp" + android:gravity="center" + android:orientation="vertical"> - + - + + - - + android:layout_marginStart="23dp" + android:gravity="center" + android:orientation="vertical"> - + - + + - - + android:layout_marginStart="23dp" + android:gravity="center" + android:orientation="vertical"> - + - + + - + android:layout_marginStart="23dp" + android:gravity="center" + android:orientation="vertical"> + + + + + - + \ No newline at end of file diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index 64f5dbbc6..bc29ffed3 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -177,7 +177,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene private boolean isWebClose = false; public static boolean isTabClose = false; private boolean isFirstOpen = true; - private int messageNumber = 0, numberMe = 1; + private int messageNumber = 0, numberMe = 0; private ImageView waitingTip; private FloatBannerView floatBanner; private boolean isfloatBannernet = true, isFirst = true; diff --git a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java index 963dc7931..e74c0ed5e 100644 --- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java @@ -243,7 +243,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. Bundle bundle = getIntent().getExtras(); if (bundle != null) { int messageNumber = bundle.getInt(MESSAGENUMBER, 0); - int numberMe = bundle.getInt(NUMBERME, 1); + int numberMe = bundle.getInt(NUMBERME, 0); onMessageIMEvent(new MessageIMEvent().setNumber(messageNumber)); onUpdateFieldEvent(new UpdateTablePointMe(numberMe)); } @@ -526,7 +526,6 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. } //红点(我的) - @Subscribe(threadMode = ThreadMode.MAIN) public void onUpdateFieldEvent(UpdateTablePointMe updateTablePointMe) { if (redpointMe == null) return; if (updateTablePointMe.getPoint() == 0) {