diff --git a/contacts/build.gradle b/contacts/build.gradle
index 9dc405d..c0dd865 100644
--- a/contacts/build.gradle
+++ b/contacts/build.gradle
@@ -59,8 +59,8 @@ dependencies {
// AndroidX 类库
api 'androidx.appcompat:appcompat:1.1.0'
api 'androidx.cardview:cardview:1.0.0'
- //api 'com.google.android.material:material:1.4.0'
- //api 'androidx.viewpager:viewpager:1.0.0'
+ api 'com.google.android.material:material:1.4.0'
+ api 'androidx.viewpager:viewpager:1.0.0'
//api 'androidx.vectordrawable:vectordrawable:1.1.0'
//api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
//api 'androidx.fragment:fragment:1.1.0'
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
index b997cf5..c71e647 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
@@ -37,7 +37,6 @@ import cc.winboll.studio.contacts.services.MainService;
import cc.winboll.studio.contacts.utils.PermissionUtils;
import cc.winboll.studio.contacts.views.DunTemperatureView;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.views.ADsBannerView;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.LogView;
import com.google.android.material.tabs.TabLayout;
@@ -76,7 +75,6 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
private final String[] REQUIRED_PERMISSIONS = PermissionUtils.BASE_PERMISSIONS;
// ====================== 4. UI控件成员区 ======================
- private ADsBannerView mADsBannerView;
private LogView mLogView;
private Toolbar mToolbar;
private CheckBox cbMainService;
@@ -136,10 +134,6 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
@Override
protected void onResume() {
super.onResume();
- if (mADsBannerView != null) {
- mADsBannerView.resumeADs(MainActivity.this);
- LogUtils.d(TAG, "onResume: 广告栏资源已恢复");
- }
}
@Override
@@ -151,11 +145,6 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
protected void onDestroy() {
super.onDestroy();
LogUtils.d(TAG, "===== onDestroy: 主Activity开始销毁 =====");
- // 释放广告资源
- if (mADsBannerView != null) {
- mADsBannerView.releaseAdResources();
- LogUtils.d(TAG, "onDestroy: 广告栏资源已释放");
- }
// 清空Fragment相关引用,避免内存泄漏
if (fragmentList != null) {
fragmentList.clear();
@@ -293,10 +282,6 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
tabLayout.setupWithViewPager(viewPager);
LogUtils.d(TAG, "initUIAndLogic: ViewPager与TabLayout初始化完成");
- // 3. 广告栏初始化
- mADsBannerView = (ADsBannerView) findViewById(R.id.adsbanner);
- LogUtils.d(TAG, "initUIAndLogic: 广告栏控件初始化完成");
-
// 左边盾值视图初始化(Java7分步写法,禁止链式调用)
DunTemperatureView tempViewLeft = (DunTemperatureView) findViewById(R.id.dun_temp_view_left);
tempViewLeft.setMaxValue(Rules.getInstance(this).getSettingsModel().getDunTotalCount());
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
index 4486910..3c5f81c 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
@@ -69,7 +69,7 @@ public class CallLogAdapter extends RecyclerView.Adapter
-
-
-
-
diff --git a/contacts/src/main/res/values/colors.xml b/contacts/src/main/res/values/colors.xml
index 5b13816..2d9faaf 100644
--- a/contacts/src/main/res/values/colors.xml
+++ b/contacts/src/main/res/values/colors.xml
@@ -10,4 +10,68 @@
#FFFFFFFF
#FFE0E0E0
+
+ #000000
+
+
+ #4A90E2
+ #2196F3
+ #1976D2
+ #66BB6A
+ #4CAF50
+ #388E3C
+ #EF5350
+ #F44336
+ #D32F2F
+ #FFF59D
+ #FFC107
+ #FFA000
+ #FF9800
+ #9C27B0
+
+
+ #00000000
+ #80000000
+
+
+ #F5F5F5
+ #EEEEEE
+ #E0E0E0
+ #BDBDBD
+ #9E9E9E
+ #757575
+ #616161
+ #424242
+ #212121
+
+
+ #4D9E9E9E
+ #809E9E9E
+ #B39E9E9E
+
+ #EEE
+ #999
+ #666
+ #333
+
+
+ #809E9E9E
+ #4D424242
+
+
+ #9E9E9E
+ #757575
+ #E0E0E0
+
+
+ #FF000000
+ #FFF5F5F5
+ #FFF5F5F5
+ #FF000000
+ #FFF5F5F5
+ #FF000000
+ #FFFFFFFF
+ #FF196ABC
+ #FF808080
+
diff --git a/contacts/src/main/res/values/styles.xml b/contacts/src/main/res/values/styles.xml
index fecdea6..0c2acc4 100644
--- a/contacts/src/main/res/values/styles.xml
+++ b/contacts/src/main/res/values/styles.xml
@@ -7,42 +7,13 @@
- @color/colorAccent
- false
- @null
-
-
-
-
-