diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 9087f47fb..f27311dd4 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -236,7 +236,7 @@ public class MainActivity extends BaseMvpActivity fragmentArray.put(MainTabLayout.MAIN_TAB_POS_MSG, new ContactsListFragment()); fragmentArray.put(MainTabLayout.MAIN_TAB_POS_SQUARE, new SquareFragment()); fragmentArray.put(MainTabLayout.MAIN_TAB_POS_ME, new MeFragment()); - fragmentArray.put(MainTabLayout.MAIN_TAB_POS_GAME, FaradayFragment.newInstance("main", null, false, null)); + fragmentArray.put(MainTabLayout.MAIN_TAB_POS_GAME, FaradayFragment.newInstance("main", null, true,null)); } public static void start(Context context) { @@ -507,6 +507,9 @@ public class MainActivity extends BaseMvpActivity } onParseIntent(); handleNimIntent(); + if (tempFragment instanceof FaradayFragment && intent != null) { + ((FaradayFragment) tempFragment).onNewIntent(intent); + } } @@ -1112,6 +1115,30 @@ public class MainActivity extends BaseMvpActivity protected void setStatusBar() { super.setStatusBar(); StatusBarUtil.transparencyBar(this); - StatusBarUtil.StatusBarLightMode(this); } + + @Override + public void onTrimMemory(int level) { + super.onTrimMemory(level); + if (tempFragment instanceof FaradayFragment) { + ((FaradayFragment) tempFragment).onTrimMemory(level); + } + } + + @Override + protected void onUserLeaveHint() { + super.onUserLeaveHint(); + if (tempFragment instanceof FaradayFragment) { + ((FaradayFragment) tempFragment).onUserLeaveHint(); + } + } + + @Override + protected void onPostResume() { + super.onPostResume(); + if (tempFragment instanceof FaradayFragment) { + ((FaradayFragment) tempFragment).onPostResume(); + } + } + } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java index 0f19a24ca..afd5e17b9 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java @@ -40,8 +40,8 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter { @Override public IPagerTitleView getTitleView(Context context, final int i) { ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true); - scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999)); - scaleTransitionPagerTitleView.setSelectedColor(mIsShowIndicator ? ContextCompat.getColor(mContext, R.color.appColor) : ContextCompat.getColor(mContext, R.color.color_333333)); + scaleTransitionPagerTitleView.setNormalColor(Color.parseColor("#4F516A")); + scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE); scaleTransitionPagerTitleView.setMinScale(0.8f); scaleTransitionPagerTitleView.setTextSize(16); int padding = UIUtil.dip2px(context, 5); diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java index 1a6329c2e..0d8afb4dc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java @@ -1,6 +1,8 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; +import android.graphics.Color; + import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; @@ -35,8 +37,8 @@ public class TopMagicIndicatorAdapter extends CommonNavigatorAdapter { @Override public IPagerTitleView getTitleView(Context context, final int i) { ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, false); - scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999)); - scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333)); + scaleTransitionPagerTitleView.setNormalColor(Color.parseColor("#4F516A")); + scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE); scaleTransitionPagerTitleView.setMinScale(0.75f); scaleTransitionPagerTitleView.setTextSize(21); scaleTransitionPagerTitleView.setText(mTitleList.get(i)); diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java index 0881b9397..94023d91a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java @@ -206,9 +206,6 @@ public class HomeFragment extends BaseMvpFragment 0 ? VISIBLE : GONE); -// tvUnread.setText(unreadCountShowRule(unreadNum)); } protected void setUnRead(int count) { @@ -127,8 +122,6 @@ public abstract class RecentViewHolder extends RecyclerViewHolder - + diff --git a/app/src/main/res/drawable/bg_shape_home_top.xml b/app/src/main/res/drawable/bg_shape_home_top.xml index d7f06f32e..c0a05b14e 100644 --- a/app/src/main/res/drawable/bg_shape_home_top.xml +++ b/app/src/main/res/drawable/bg_shape_home_top.xml @@ -4,8 +4,8 @@ + android:endColor="#462893" + android:startColor="#356DC1" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_add_friends_f4f1ff.xml b/app/src/main/res/drawable/shape_add_friends_2a2a39.xml similarity index 83% rename from app/src/main/res/drawable/shape_add_friends_f4f1ff.xml rename to app/src/main/res/drawable/shape_add_friends_2a2a39.xml index 8a8d99ee1..b071736d5 100644 --- a/app/src/main/res/drawable/shape_add_friends_f4f1ff.xml +++ b/app/src/main/res/drawable/shape_add_friends_2a2a39.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/shape_home_bg_15dp.xml b/app/src/main/res/drawable/shape_home_bg_15dp.xml new file mode 100644 index 000000000..f9fd98c6e --- /dev/null +++ b/app/src/main/res/drawable/shape_home_bg_15dp.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml index 8e1b5de76..ab15972cd 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/app/src/main/res/layout/fragment_contact_list.xml @@ -1,8 +1,9 @@ diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index f111e8c70..84c6d532e 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/app/src/main/res/layout/fragment_game_home.xml @@ -19,7 +19,7 @@ - - @@ -220,7 +208,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_15" - android:layout_marginBottom="5dp"> + android:layout_marginBottom="15dp"> @@ -250,8 +237,8 @@ android:id="@+id/magic_indicator_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="14dp" - android:paddingRight="14dp" /> + android:paddingLeft="13dp" + android:paddingRight="10dp" /> diff --git a/app/src/main/res/layout/fragment_home_room_tab.xml b/app/src/main/res/layout/fragment_home_room_tab.xml index 7e5b96ee1..304ddd60e 100644 --- a/app/src/main/res/layout/fragment_home_room_tab.xml +++ b/app/src/main/res/layout/fragment_home_room_tab.xml @@ -2,7 +2,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/color_F9F9F9" tools:context="com.yizhuan.erban.home.fragment.HomeOtherTabFragment"> diff --git a/app/src/main/res/layout/fragment_recent_list.xml b/app/src/main/res/layout/fragment_recent_list.xml index 71d93c228..11120ee8e 100644 --- a/app/src/main/res/layout/fragment_recent_list.xml +++ b/app/src/main/res/layout/fragment_recent_list.xml @@ -35,7 +35,7 @@ diff --git a/app/src/main/res/layout/item_home_add_friends.xml b/app/src/main/res/layout/item_home_add_friends.xml index 21cb314cb..7bda15239 100644 --- a/app/src/main/res/layout/item_home_add_friends.xml +++ b/app/src/main/res/layout/item_home_add_friends.xml @@ -15,7 +15,7 @@ android:layout_height="0dp" android:layout_marginStart="15dp" android:layout_marginEnd="15dp" - android:background="@drawable/shape_add_friends_f4f1ff" + android:background="@drawable/shape_add_friends_2a2a39" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -47,7 +47,7 @@ android:layout_marginStart="@dimen/dp_6" android:ellipsize="end" android:lines="1" - android:textColor="@color/color_333333" + android:textColor="@color/white" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="@id/iv_room_avatar" app:layout_constraintStart_toEndOf="@id/iv_room_avatar" @@ -62,7 +62,7 @@ android:layout_marginEnd="15dp" android:drawableStart="@drawable/ic_online_user_count" android:includeFontPadding="false" - android:textColor="@color/color_333333" + android:textColor="@color/white" android:textSize="@dimen/dp_13" app:layout_constraintBottom_toBottomOf="@id/iv_room_avatar" app:layout_constraintEnd_toEndOf="@id/view_bg" @@ -96,7 +96,7 @@ android:layout_width="65dp" android:layout_height="65dp" android:src="@drawable/ic_home_play_empty" - app:cborder_color="#FFBD2F" + app:cborder_color="#248CFE" app:cborder_width="@dimen/dp_2" /> diff --git a/app/src/main/res/layout/item_home_dynamic.xml b/app/src/main/res/layout/item_home_dynamic.xml index 33a0d2917..5665187b3 100644 --- a/app/src/main/res/layout/item_home_dynamic.xml +++ b/app/src/main/res/layout/item_home_dynamic.xml @@ -8,7 +8,7 @@ android:layout_marginStart="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_15" android:paddingBottom="13.5dp" - android:background="@drawable/bg_corner_shadow_12"> + android:background="@drawable/shape_add_friends_2a2a39"> diff --git a/app/src/main/res/layout/layout_ktv_empty.xml b/app/src/main/res/layout/layout_ktv_empty.xml index 70cbba3b1..778c6d3ce 100644 --- a/app/src/main/res/layout/layout_ktv_empty.xml +++ b/app/src/main/res/layout/layout_ktv_empty.xml @@ -2,7 +2,6 @@ @@ -13,7 +12,6 @@ android:layout_height="wrap_content" android:src="@drawable/icon_common_failure" /> - diff --git a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml index 4ae326a8a..c88512734 100644 --- a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml +++ b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml @@ -2,190 +2,205 @@ - - - - - - - - + android:orientation="vertical" + tools:background="@color/color_1c1b22"> + android:layout_width="match_parent" + android:layout_height="71dp" + android:orientation="horizontal"> - + android:layout_gravity="center_vertical" + android:layout_marginStart="5dp"> - + + + + + + + + + android:gravity="center_vertical"> - + - + - + - + + + + + + + + + + + + + + + - + android:layout_marginEnd="15dp" + android:gravity="end" + android:orientation="vertical"> - + android:layout_height="@dimen/dp_18" + android:layout_gravity="right" + android:singleLine="true" + android:visibility="gone" + tools:text="123" + tools:visibility="visible" /> + android:layout_gravity="center_vertical|right" + android:layout_marginTop="2dp" + android:textColor="#4F516A" + android:textSize="11dp" + tools:text="just now" /> - + - - - - - - - - - + android:background="#353548" /> diff --git a/app/src/main/res/values/base_styles.xml b/app/src/main/res/values/base_styles.xml index 80a2d7fac..5dfa42c2f 100644 --- a/app/src/main/res/values/base_styles.xml +++ b/app/src/main/res/values/base_styles.xml @@ -5,7 +5,7 @@ true -