mirror of
https://gitea.winboll.cc/ZhanGSKen/MyWinBoLL.git
synced 2026-08-14 05:27:11 +08:00
修复编译问题,移除广告功能和应用支持模式设置
主要修改: - 修复:启用material和viewpager库依赖,解决TabLayout缺失问题 - 修复:在ContactAdapter和CallLogAdapter中holder参数添加final,兼容Java7语法 - 修复:修改主题使用AppCompat兼容主题,解决Activity启动崩溃问题 - 修复:添加完整的颜色资源定义 - 移除:移除MainActivity中所有广告相关代码 - 移除:从activity_main.xml中移除ADsBannerView控件 - 移除:从activity_settings.xml中移除应用支持模式设置控件
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -69,7 +69,7 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull CallLogViewHolder holder, int position) {
|
||||
public void onBindViewHolder(@NonNull final CallLogViewHolder holder, int position) {
|
||||
LogUtils.d(TAG, "onBindViewHolder: 绑定列表项数据,position=" + position);
|
||||
final CallLogModel callLog = callLogList.get(position);
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull ContactViewHolder holder, int position) {
|
||||
public void onBindViewHolder(@NonNull final ContactViewHolder holder, int position) {
|
||||
LogUtils.d(TAG, "onBindViewHolder: 绑定联系人列表项数据,position=" + position);
|
||||
final ContactModel contact = contactList.get(position);
|
||||
|
||||
|
||||
@@ -12,11 +12,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/activitymainToolbar1"/>
|
||||
|
||||
<cc.winboll.studio.libaes.views.ADsBannerView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/adsbanner"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
|
||||
@@ -369,11 +369,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<cc.winboll.studio.libaes.views.ADsControlView
|
||||
android:id="@+id/ads_control_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -10,4 +10,68 @@
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
<color name="lightgray">#FFE0E0E0</color>
|
||||
|
||||
<!-- 基础黑白(必含,适配文字/背景) -->
|
||||
<color name="black">#000000</color>
|
||||
|
||||
<!-- 基础色系(按钮/强调色常用) -->
|
||||
<color name="blue_light">#4A90E2</color>
|
||||
<color name="blue_normal">#2196F3</color>
|
||||
<color name="blue_dark">#1976D2</color>
|
||||
<color name="green_light">#66BB6A</color>
|
||||
<color name="green_normal">#4CAF50</color>
|
||||
<color name="green_dark">#388E3C</color>
|
||||
<color name="red_light">#EF5350</color>
|
||||
<color name="red_normal">#F44336</color>
|
||||
<color name="red_dark">#D32F2F</color>
|
||||
<color name="yellow_light">#FFF59D</color>
|
||||
<color name="yellow_normal">#FFC107</color>
|
||||
<color name="yellow_dark">#FFA000</color>
|
||||
<color name="orange_normal">#FF9800</color>
|
||||
<color name="purple_normal">#9C27B0</color>
|
||||
|
||||
<!-- 透明色(遮罩/背景叠加) -->
|
||||
<color name="transparent">#00000000</color>
|
||||
<color name="black_transparent_50">#80000000</color>
|
||||
|
||||
<!-- 不透明灰色(常用深浅梯度) -->
|
||||
<color name="gray_100">#F5F5F5</color>
|
||||
<color name="gray_200">#EEEEEE</color>
|
||||
<color name="gray_300">#E0E0E0</color>
|
||||
<color name="gray_400">#BDBDBD</color>
|
||||
<color name="gray_500">#9E9E9E</color>
|
||||
<color name="gray_600">#757575</color>
|
||||
<color name="gray_700">#616161</color>
|
||||
<color name="gray_800">#424242</color>
|
||||
<color name="gray_900">#212121</color>
|
||||
|
||||
<!-- 半透明灰色 -->
|
||||
<color name="gray_transparent_30">#4D9E9E9E</color>
|
||||
<color name="gray_transparent_50">#809E9E9E</color>
|
||||
<color name="gray_transparent_70">#B39E9E9E</color>
|
||||
|
||||
<color name="gray_light">#EEE</color>
|
||||
<color name="gray_mid">#999</color>
|
||||
<color name="gray_dark">#666</color>
|
||||
<color name="gray_black">#333</color>
|
||||
|
||||
<!-- 遮罩/蒙层 -->
|
||||
<color name="mask_gray">#809E9E9E</color>
|
||||
<color name="bg_overlay_gray">#4D424242</color>
|
||||
|
||||
<!-- 按钮灰色 -->
|
||||
<color name="btn_gray_normal">#9E9E9E</color>
|
||||
<color name="btn_gray_pressed">#757575</color>
|
||||
<color name="btn_gray_disabled">#E0E0E0</color>
|
||||
|
||||
<!-- 主题颜色 (适配 libappbase) -->
|
||||
<color name="colorText">#FF000000</color>
|
||||
<color name="colorTextBackgound">#FFF5F5F5</color>
|
||||
<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
|
||||
<color name="mainWindowTextColor">#FF000000</color>
|
||||
<color name="mainWindowDarkBackgroundColor">#FFF5F5F5</color>
|
||||
<color name="mainWindowDarkTextColor">#FF000000</color>
|
||||
<color name="toolbarTextColor">#FFFFFFFF</color>
|
||||
<color name="toolbarBackgroundColor">#FF196ABC</color>
|
||||
<color name="debugTextColor">#FF808080</color>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -7,42 +7,13 @@
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="android:windowFullscreen">false</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="GlobalCrashActivityTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<style name="GlobalCrashActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorTittle">@color/colorAccent</item>
|
||||
<item name="colorTittleBackgound">@color/colorPrimary</item>
|
||||
<item name="colorText">@color/colorAccent</item>
|
||||
<item name="colorTextBackgound">@color/colorPrimaryDark</item>
|
||||
|
||||
</style>
|
||||
|
||||
<!-- 方案2:带 ActionBar 主题(如需系统默认标题栏,启用此方案) -->
|
||||
<!--
|
||||
<style name="MyAppTheme" parent="Theme.MaterialComponents.Light">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="android:windowFullscreen">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
|
||||
<item name="android:textSizeHeadline">18sp</item>
|
||||
<item name="android:textSizeBody">16sp</item>
|
||||
<item name="android:textSizeSubtitle">14sp</item>
|
||||
<item name="android:textSizeCaption">12sp</item>
|
||||
</style>
|
||||
|
||||
<style name="GlobalCrashActivityTheme" parent="Theme.MaterialComponents.Light">
|
||||
<item name="colorTittle">@color/colorAccent</item>
|
||||
<item name="colorTittleBackgound">@color/colorPrimary</item>
|
||||
<item name="colorText">@color/colorAccent</item>
|
||||
<item name="colorTextBackgound">@color/colorPrimaryDark</item>
|
||||
|
||||
<item name="android:textSizeHeadline">20sp</item>
|
||||
<item name="android:textSizeBody">14sp</item>
|
||||
<item name="android:textSizeButton">16sp</item>
|
||||
</style>
|
||||
-->
|
||||
</resources>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user