amos/android-new-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Compare commits

base: amos/android-new-app:v1.0.7
Branches Tags
amos/android-new-app:main
amos/android-new-app:v1.0.9 amos/android-new-app:v1.0.8 amos/android-new-app:v1.0.7 amos/android-new-app:v1.0.6 amos/android-new-app:v1.0.5 amos/android-new-app:v1.0.4 amos/android-new-app:v1.0.3 amos/android-new-app:v1.0.2 amos/android-new-app:v1.0.1 amos/android-new-app:v1.0.0 amos/android-new-app:test-v0.0.1
...
compare: amos/android-new-app:v1.0.9
Branches Tags
amos/android-new-app:main
amos/android-new-app:v1.0.9 amos/android-new-app:v1.0.8 amos/android-new-app:v1.0.7 amos/android-new-app:v1.0.6 amos/android-new-app:v1.0.5 amos/android-new-app:v1.0.4 amos/android-new-app:v1.0.3 amos/android-new-app:v1.0.2 amos/android-new-app:v1.0.1 amos/android-new-app:v1.0.0 amos/android-new-app:test-v0.0.1
2 Commits
v1.0.7 ... v1.0.9
Author SHA1 Message Date
amos fa30960437 fix: 添加 ScrollView 让内容可滚动，修复底部导航栏被挤出的问题
Android Release / release (push) Successful in 46s
Details
2026-06-03 01:07:18 +08:00
amos a5134ce285 feat: 去除搜索框，添加博客占位骨架屏，轮播图圆角优化
Android Release / release (push) Successful in 44s
Details
2026-06-03 01:00:00 +08:00
3 changed files with 412 additions and 466 deletions
Expand all files Collapse all files
app/src/main/java/com/arkj/app/MainActivity.java
+5 -18
View File
@@ -56,7 +56,6 @@ public class MainActivity extends Activity {
@Override @Override
public void onPageStarted(WebView view, String url, Bitmap favicon) { public void onPageStarted(WebView view, String url, Bitmap favicon) {
super.onPageStarted(view, url, favicon); super.onPageStarted(view, url, favicon);
// 开始加载
} }
@Override @Override
@@ -72,7 +71,6 @@ public class MainActivity extends Activity {
@Override @Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl); super.onReceivedError(view, errorCode, description, failingUrl);
// 加载失败，显示错误提示
if (loadingView != null) { if (loadingView != null) {
loadingView.setVisibility(View.GONE); loadingView.setVisibility(View.GONE);
} }
@@ -80,61 +78,50 @@ public class MainActivity extends Activity {
} }
}); });
// 加载网络图片 // 加载网络图片 - 添加圆角样式
String html = "<html><body style='margin:0;padding:0;background:#f3f4f6;'>" + String html = "<html><body style='margin:0;padding:0;background:#f3f4f6;border-radius:16px;overflow:hidden;'>" +
"<div style='display:flex;align-items:center;justify-content:center;height:100vh;margin:0;'>" + "<div style='display:flex;align-items:center;justify-content:center;height:100vh;margin:0;border-radius:16px;overflow:hidden;'>" +
"<img src='" + CAROUSEL_URL + "' style='width:100%;height:100%;object-fit:cover;' " + "<img src='" + CAROUSEL_URL + "' style='width:100%;height:100%;object-fit:cover;border-radius:16px;' " +
"onload='document.body.style.height=\"auto\"' " + "onload='document.body.style.height=\"auto\"' " +
"onerror='document.body.innerHTML=\"<div style=\\\"color:#999;text-align:center;padding:20px;\\\">图片加载失败</div>\"' />" + "onerror='document.body.innerHTML=\"<div style=\\\"color:#999;text-align:center;padding:20px;font-family:sans-serif;\\\">图片加载失败</div>\"' />" +
"</div>" + "</div>" +
"</body></html>"; "</body></html>";
carouselWebView.loadDataWithBaseURL(null, html, "text/html", "UTF-8", null); carouselWebView.loadDataWithBaseURL(null, html, "text/html", "UTF-8", null);
} }
private void setupFunctionButtons() { private void setupFunctionButtons() {
// 备忘录
findViewById(R.id.btnMemo).setOnClickListener(v -> findViewById(R.id.btnMemo).setOnClickListener(v ->
Toast.makeText(this, "打开备忘录", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "打开备忘录", Toast.LENGTH_SHORT).show());
// 二维码
findViewById(R.id.btnQRCode).setOnClickListener(v -> findViewById(R.id.btnQRCode).setOnClickListener(v ->
Toast.makeText(this, "打开二维码扫描", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "打开二维码扫描", Toast.LENGTH_SHORT).show());
// 谁在干活
findViewById(R.id.btnWhoWorking).setOnClickListener(v -> findViewById(R.id.btnWhoWorking).setOnClickListener(v ->
Toast.makeText(this, "查看谁在干活", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "查看谁在干活", Toast.LENGTH_SHORT).show());
// PVE
findViewById(R.id.btnPVE).setOnClickListener(v -> findViewById(R.id.btnPVE).setOnClickListener(v ->
Toast.makeText(this, "打开 PVE", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "打开 PVE", Toast.LENGTH_SHORT).show());
// 快递
findViewById(R.id.btnExpress).setOnClickListener(v -> findViewById(R.id.btnExpress).setOnClickListener(v ->
Toast.makeText(this, "查看快递", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "查看快递", Toast.LENGTH_SHORT).show());
// 纪念日
findViewById(R.id.btnAnniversary).setOnClickListener(v -> findViewById(R.id.btnAnniversary).setOnClickListener(v ->
Toast.makeText(this, "查看纪念日", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "查看纪念日", Toast.LENGTH_SHORT).show());
// 记账
findViewById(R.id.btnAccounting).setOnClickListener(v -> findViewById(R.id.btnAccounting).setOnClickListener(v ->
Toast.makeText(this, "打开记账", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "打开记账", Toast.LENGTH_SHORT).show());
// 更多
findViewById(R.id.btnMore).setOnClickListener(v -> findViewById(R.id.btnMore).setOnClickListener(v ->
Toast.makeText(this, "更多功能", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "更多功能", Toast.LENGTH_SHORT).show());
} }
private void setupBottomNavigation() { private void setupBottomNavigation() {
// 首页
findViewById(R.id.navHome).setOnClickListener(v -> findViewById(R.id.navHome).setOnClickListener(v ->
Toast.makeText(this, "已在首页", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "已在首页", Toast.LENGTH_SHORT).show());
// 中间按钮
findViewById(R.id.navCenter).setOnClickListener(v -> findViewById(R.id.navCenter).setOnClickListener(v ->
Toast.makeText(this, "快速操作", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "快速操作", Toast.LENGTH_SHORT).show());
// 我的
findViewById(R.id.navProfile).setOnClickListener(v -> findViewById(R.id.navProfile).setOnClickListener(v ->
Toast.makeText(this, "打开个人中心", Toast.LENGTH_SHORT).show()); Toast.makeText(this, "打开个人中心", Toast.LENGTH_SHORT).show());
} }
app/src/main/res/drawable/bg_carousel.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- 轮播图背景卡片 --> <!-- 轮播图背景 - 圆角 -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#FFFFFF"/> <solid android:color="#FFFFFF"/>
app/src/main/res/layout/activity_main.xml
+112 -153
View File
@@ -5,6 +5,18 @@
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/bg_gradient"> android:background="@drawable/bg_gradient">
<!-- 可滚动内容区域 -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- 顶部欢迎区域 --> <!-- 顶部欢迎区域 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -31,51 +43,6 @@
android:layout_marginTop="2dp"/> android:layout_marginTop="2dp"/>
</LinearLayout> </LinearLayout>
<!-- 搜索栏 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingHorizontal="24dp"
android:gravity="center_vertical"
android:layout_marginBottom="16dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:orientation="horizontal"
android:background="@drawable/bg_search"
android:paddingHorizontal="16dp"
android:gravity="center_vertical"
android:clickable="true"
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_search"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_hint"
android:textColor="#6B7280"
android:textSize="15sp"
android:layout_marginStart="12dp"/>
</LinearLayout>
<ImageView
android:layout_width="44dp"
android:layout_height="44dp"
android:src="@drawable/ic_scan"
android:padding="10dp"
android:layout_marginStart="12dp"
android:background="@drawable/bg_card"
android:clickable="true"
android:focusable="true"/>
</LinearLayout>
<!-- 轮播图区域（含加载指示器） --> <!-- 轮播图区域（含加载指示器） -->
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -366,137 +333,129 @@
android:focusable="true"/> android:focusable="true"/>
</LinearLayout> </LinearLayout>
<!-- 博客列表 --> <!-- 博客列表占位 -->
<ScrollView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:layout_marginBottom="16dp">
<!-- 博客占位 1 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:orientation="horizontal"
android:background="@drawable/bg_blog_card"
android:elevation="2dp"
android:layout_marginBottom="12dp"
android:padding="12dp"
android:gravity="center_vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:clipToPadding="false"
android:paddingBottom="80dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="24dp"> android:gravity="center_vertical">
<!-- 博客卡片 1 --> <View
<LinearLayout android:layout_width="120dp"
android:layout_width="match_parent" android:layout_height="16dp"
android:layout_height="wrap_content" android:background="#E5E7EB"
android:orientation="vertical"
android:background="@drawable/bg_blog_card"
android:elevation="2dp"
android:layout_marginBottom="12dp"
android:clickable="true"
android:focusable="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Android 开发入门"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="#1F2937"
android:layout_marginBottom="8dp"/> android:layout_marginBottom="8dp"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="200dp"
android:layout_height="wrap_content" android:layout_height="12dp"
android:text="学习 Android 开发的基础知识，包括 Activity、Fragment 等核心概念..." android:background="#F3F4F6"/>
android:textColor="#6B7280"
android:textSize="14sp"
android:maxLines="2"
android:ellipsize="end"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2 小时前"
android:textColor="#9CA3AF"
android:textSize="12sp"
android:layout_marginTop="8dp"/>
</LinearLayout> </LinearLayout>
<!-- 博客卡片 2 --> <View
<LinearLayout android:layout_width="60dp"
android:layout_width="match_parent" android:layout_height="60dp"
android:layout_height="wrap_content" android:background="#E5E7EB"
android:orientation="vertical" android:layout_marginStart="12dp"/>
android:background="@drawable/bg_blog_card"
android:elevation="2dp"
android:layout_marginBottom="12dp"
android:clickable="true"
android:focusable="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Kotlin 协程详解"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="#1F2937"
android:layout_marginBottom="8dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="深入理解 Kotlin 协程的工作原理，掌握异步编程的最佳实践..."
android:textColor="#6B7280"
android:textSize="14sp"
android:maxLines="2"
android:ellipsize="end"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="昨天"
android:textColor="#9CA3AF"
android:textSize="12sp"
android:layout_marginTop="8dp"/>
</LinearLayout> </LinearLayout>
<!-- 博客卡片 3 --> <!-- 博客占位 2 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="80dp"
android:orientation="vertical" android:orientation="horizontal"
android:background="@drawable/bg_blog_card" android:background="@drawable/bg_blog_card"
android:elevation="2dp" android:elevation="2dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:clickable="true" android:padding="12dp"
android:focusable="true"> android:gravity="center_vertical">
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:text="Jetpack Compose 实战" android:layout_weight="1"
android:textSize="16sp" android:orientation="vertical"
android:textStyle="bold" android:gravity="center_vertical">
android:textColor="#1F2937"
<View
android:layout_width="120dp"
android:layout_height="16dp"
android:background="#E5E7EB"
android:layout_marginBottom="8dp"/> android:layout_marginBottom="8dp"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="200dp"
android:layout_height="wrap_content" android:layout_height="12dp"
android:text="使用 Jetpack Compose 构建现代化的 Android 界面，声明式 UI 的魅力..." android:background="#F3F4F6"/>
android:textColor="#6B7280" </LinearLayout>
android:textSize="14sp"
android:maxLines="2"
android:ellipsize="end"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="60dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:text="3 天前" android:background="#E5E7EB"
android:textColor="#9CA3AF" android:layout_marginStart="12dp"/>
android:textSize="12sp" </LinearLayout>
android:layout_marginTop="8dp"/>
<!-- 博客占位 3 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:orientation="horizontal"
android:background="@drawable/bg_blog_card"
android:elevation="2dp"
android:layout_marginBottom="12dp"
android:padding="12dp"
android:gravity="center_vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center_vertical">
<View
android:layout_width="120dp"
android:layout_height="16dp"
android:background="#E5E7EB"
android:layout_marginBottom="8dp"/>
<View
android:layout_width="200dp"
android:layout_height="12dp"
android:background="#F3F4F6"/>
</LinearLayout>
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:background="#E5E7EB"
android:layout_marginStart="12dp"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<!-- 底部导航 --> <!-- 底部导航（固定在底部） -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"