Commit 66cb179c authored by fallenstardust's avatar fallenstardust

萌卡添加通知红点

parent 28e24bd3
package cn.garymb.ygomobile.ui.home; package cn.garymb.ygomobile.ui.home;
import static com.ashokvarma.bottomnavigation.ShapeBadgeItem.SHAPE_STAR_4_VERTICES;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.Toast; import android.widget.Toast;
...@@ -12,6 +15,8 @@ import androidx.fragment.app.Fragment; ...@@ -12,6 +15,8 @@ import androidx.fragment.app.Fragment;
import com.ashokvarma.bottomnavigation.BottomNavigationBar; import com.ashokvarma.bottomnavigation.BottomNavigationBar;
import com.ashokvarma.bottomnavigation.BottomNavigationItem; import com.ashokvarma.bottomnavigation.BottomNavigationItem;
import com.ashokvarma.bottomnavigation.ShapeBadgeItem;
import com.ashokvarma.bottomnavigation.TextBadgeItem;
import com.tencent.bugly.beta.Beta; import com.tencent.bugly.beta.Beta;
import com.tencent.smtt.sdk.QbSdk; import com.tencent.smtt.sdk.QbSdk;
...@@ -32,6 +37,8 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat ...@@ -32,6 +37,8 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
long exitLasttime = 0; long exitLasttime = 0;
private BottomNavigationBar bottomNavigationBar; private BottomNavigationBar bottomNavigationBar;
private ShapeBadgeItem mShapeBadgeItem;
private TextBadgeItem mTextBadgeItem;
private FrameLayout frameLayout; private FrameLayout frameLayout;
private Fragment mFragment; private Fragment mFragment;
...@@ -91,19 +98,28 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat ...@@ -91,19 +98,28 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
private void initBottomNavigationBar() { private void initBottomNavigationBar() {
frameLayout = (FrameLayout) findViewById(R.id.fragment_content); frameLayout = (FrameLayout) findViewById(R.id.fragment_content);
mTextBadgeItem = new TextBadgeItem()
.setBorderWidth(4)//文本大小
.setGravity(Gravity.LEFT )//位置 默认右上
.setBackgroundColorResource(R.color.holo_orange_bright)//背景颜色
.setAnimationDuration(200)//动画时间
.setText("3")
.setHideOnSelect(false)//true当选中状态时消失,非选中状态再次显示
.show();
// 获取页面上的底部导航栏控件 // 获取页面上的底部导航栏控件
bottomNavigationBar = (BottomNavigationBar) findViewById(R.id.bottom_navigation_bar); bottomNavigationBar = (BottomNavigationBar) findViewById(R.id.bottom_navigation_bar);
bottomNavigationBar bottomNavigationBar
.addItem(new BottomNavigationItem(R.drawable.home, R.string.mc_home)) .addItem(new BottomNavigationItem(R.drawable.home, R.string.mc_home))
.addItem(new BottomNavigationItem(R.drawable.searcher, R.string.search)) .addItem(new BottomNavigationItem(R.drawable.searcher, R.string.search))
.addItem(new BottomNavigationItem(R.drawable.deck, R.string.deck_manager)) .addItem(new BottomNavigationItem(R.drawable.deck, R.string.deck_manager))
.addItem(new BottomNavigationItem(R.drawable.mycard, R.string.mycard)) .addItem(new BottomNavigationItem(R.drawable.mycard, R.string.mycard).setBadgeItem(mTextBadgeItem))
.addItem(new BottomNavigationItem(R.drawable.my, R.string.personal)) .addItem(new BottomNavigationItem(R.drawable.my, R.string.personal))
.setActiveColor(R.color.holo_blue_bright) .setActiveColor(R.color.holo_blue_bright)
.setBarBackgroundColor(R.color.transparent) .setBarBackgroundColor(R.color.transparent)
.setMode(BottomNavigationBar.MODE_FIXED) .setMode(BottomNavigationBar.MODE_FIXED)
.setFirstSelectedPosition(0) .setFirstSelectedPosition(0)
.initialise();//所有的设置需在调用该方法前完成 .initialise();//所有的设置需在调用该方法前完成
bottomNavigationBar.setTabSelectedListener(this); bottomNavigationBar.setTabSelectedListener(this);
fragment_home = new HomeFragment(); fragment_home = new HomeFragment();
fragment_search = new CardSearchFragment(); fragment_search = new CardSearchFragment();
......
...@@ -49,7 +49,6 @@ public class MyCard { ...@@ -49,7 +49,6 @@ public class MyCard {
private static final String return_sso_url = "https://mycard.moe/mobile/?"; private static final String return_sso_url = "https://mycard.moe/mobile/?";
private static final String HOST_MC = "mycard.moe"; private static final String HOST_MC = "mycard.moe";
public static final String MC_MAIN_URL = "https://mycard.moe/mobile/ygopro/lobby"; public static final String MC_MAIN_URL = "https://mycard.moe/mobile/ygopro/lobby";
public static final String DOWNLOAD_URL_EZ = "http://t.cn/EchWyLi";
public static final String MYCARD_NEWS_URL = "https://api.mycard.moe/apps.json"; public static final String MYCARD_NEWS_URL = "https://api.mycard.moe/apps.json";
public static final String MYCARD_POST_URL = "https://ygobbs.com/t/"; public static final String MYCARD_POST_URL = "https://ygobbs.com/t/";
...@@ -77,6 +76,7 @@ public class MyCard { ...@@ -77,6 +76,7 @@ public class MyCard {
public static final String ACTION_OPEN_MYCARD = "ygomobile.intent.action.MYCARD"; public static final String ACTION_OPEN_MYCARD = "ygomobile.intent.action.MYCARD";
public static final String URL_MC_LOGIN = "https://accounts.moecube.com/"; public static final String URL_MC_LOGIN = "https://accounts.moecube.com/";
public static final String URL_MC_LOGOUT = "https://accounts.moecube.com/signin";
public static final String ARG_SSO = "sso"; public static final String ARG_SSO = "sso";
public static final String URL_MC_WATCH_DUEL_FUN = "wss://tiramisu.mycard.moe:7923/?filter=started"; public static final String URL_MC_WATCH_DUEL_FUN = "wss://tiramisu.mycard.moe:7923/?filter=started";
public static final String URL_MC_WATCH_DUEL_MATCH = "wss://tiramisu.mycard.moe:8923/?filter=started"; public static final String URL_MC_WATCH_DUEL_MATCH = "wss://tiramisu.mycard.moe:8923/?filter=started";
......
package cn.garymb.ygomobile.ui.mycard; package cn.garymb.ygomobile.ui.mycard;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
import static okhttp3.internal.Util.UTF_8; import static okhttp3.internal.Util.UTF_8;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
...@@ -17,7 +16,6 @@ import android.os.Handler; ...@@ -17,7 +16,6 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -50,7 +48,6 @@ import cn.garymb.ygomobile.ui.mycard.base.OnJoinChatListener; ...@@ -50,7 +48,6 @@ import cn.garymb.ygomobile.ui.mycard.base.OnJoinChatListener;
import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener; import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener;
import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage; import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage;
import cn.garymb.ygomobile.ui.mycard.mcchat.management.ServiceManagement; import cn.garymb.ygomobile.ui.mycard.mcchat.management.ServiceManagement;
import cn.garymb.ygomobile.ui.mycard.mcchat.management.UserManagement;
import cn.garymb.ygomobile.utils.HandlerUtil; import cn.garymb.ygomobile.utils.HandlerUtil;
import cn.garymb.ygomobile.utils.YGOUtil; import cn.garymb.ygomobile.utils.YGOUtil;
import cn.garymb.ygomobile.utils.glide.GlideCompat; import cn.garymb.ygomobile.utils.glide.GlideCompat;
...@@ -312,7 +309,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -312,7 +309,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { switch (v.getId()) {
case R.id.ll_head_login: case R.id.ll_head_login:
mWebViewPlus.loadUrl("https://accounts.moecube.com/profiles"); mWebViewPlus.loadUrl(mMyCard.URL_MC_LOGOUT);
break; break;
case R.id.tv_back_mc: case R.id.tv_back_mc:
onHome(); onHome();
......
<vector android:height="24dp" android:tint="#02FFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>
...@@ -57,8 +57,11 @@ ...@@ -57,8 +57,11 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:src="@drawable/avatar" /> android:src="@drawable/avatar" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_logout"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:src="@drawable/ic_guide_right" />
</LinearLayout> </LinearLayout>
<androidx.appcompat.widget.AppCompatButton <androidx.appcompat.widget.AppCompatButton
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment