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.4
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.8
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
5 Commits
v1.0.4 .. v1.0.8
Author SHA1 Message Date
amos a5134ce285 feat: 去除搜索框，添加博客占位骨架屏，轮播图圆角优化
Android Release / release (push) Successful in 44s
Details
2026-06-03 01:00:00 +08:00
amos b86fa7586d feat: 添加轮播图预加载指示器，完善三篇博客占位内容
Android Release / release (push) Successful in 46s
Details
2026-06-03 00:52:57 +08:00
amos 462c889964 feat: 使用 WebView 加载网络轮播图，加深搜索图标，添加网络权限
Android Release / release (push) Successful in 50s
Details
2026-06-03 00:46:44 +08:00
amos 501244a5c0 fix: 移除不存在的 btnMaterials 引用
Android Release / release (push) Successful in 44s
Details
2026-06-03 00:42:26 +08:00
amos 5cb485f486 feat: 添加轮播图和博客展示区，优化搜索图标可见性
Android Release / release (push) Failing after 23s
Details
2026-06-03 00:39:00 +08:00
8 changed files with 381 additions and 154 deletions
Expand all files Collapse all files
app/src/main/AndroidManifest.xml
+6 -1
View File
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 网络权限 -->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application <application
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:theme="@android:style/Theme.DeviceDefault.Light.NoActionBar"> android:theme="@android:style/Theme.DeviceDefault.Light.NoActionBar"
android:usesCleartextTraffic="true">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
app/src/main/java/com/arkj/app/MainActivity.java
+71 -15
View File
@@ -1,16 +1,34 @@
package com.arkj.app; package com.arkj.app;
import android.app.Activity; import android.app.Activity;
import android.graphics.Bitmap;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ProgressBar;
import android.widget.Toast; import android.widget.Toast;
public class MainActivity extends Activity { public class MainActivity extends Activity {
// 轮播图 URL
private static final String CAROUSEL_URL = "https://alist.kg8.net/d/蓝奏云/IMG_20190602_082558.webp";
private WebView carouselWebView;
private View loadingView;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
// 初始化视图
carouselWebView = findViewById(R.id.carouselWebView);
loadingView = findViewById(R.id.carouselLoading);
// 加载轮播图（预加载，完成后显示）
loadCarousel();
// 设置功能按钮点击事件 // 设置功能按钮点击事件
setupFunctionButtons(); setupFunctionButtons();
@@ -18,54 +36,92 @@ public class MainActivity extends Activity {
setupBottomNavigation(); setupBottomNavigation();
} }
private void loadCarousel() {
// 显示加载指示器
if (loadingView != null) {
loadingView.setVisibility(View.VISIBLE);
}
// 隐藏 WebView 直到加载完成
carouselWebView.setVisibility(View.INVISIBLE);
WebSettings settings = carouselWebView.getSettings();
settings.setJavaScriptEnabled(true);
settings.setLoadWithOverviewMode(true);
settings.setUseWideViewPort(true);
settings.setCacheMode(WebSettings.LOAD_DEFAULT);
// 设置 WebViewClient 监听加载完成
carouselWebView.setWebViewClient(new WebViewClient() {
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
super.onPageStarted(view, url, favicon);
}
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
// 加载完成，显示 WebView，隐藏加载指示器
carouselWebView.setVisibility(View.VISIBLE);
if (loadingView != null) {
loadingView.setVisibility(View.GONE);
}
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl);
if (loadingView != null) {
loadingView.setVisibility(View.GONE);
}
Toast.makeText(MainActivity.this, "轮播图加载失败", Toast.LENGTH_SHORT).show();
}
});
// 加载网络图片 - 添加圆角样式
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;border-radius:16px;overflow:hidden;'>" +
"<img src='" + CAROUSEL_URL + "' style='width:100%;height:100%;object-fit:cover;border-radius:16px;' " +
"onload='document.body.style.height=\"auto\"' " +
"onerror='document.body.innerHTML=\"<div style=\\\"color:#999;text-align:center;padding:20px;font-family:sans-serif;\\\">图片加载失败</div>\"' />" +
"</div>" +
"</body></html>";
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.btnMaterials).setOnClickListener(v ->
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_blog_card.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 博客卡片背景 -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFFFF"/>
<corners android:radius="12dp"/>
<padding
android:left="12dp"
android:top="12dp"
android:right="12dp"
android:bottom="12dp"/>
</shape>
app/src/main/res/drawable/bg_carousel.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 轮播图背景 - 圆角 -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFFFF"/>
<corners android:radius="16dp"/>
<padding
android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"/>
</shape>
app/src/main/res/drawable/carousel_image.jpg
+23
View File
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="color-scheme" content="dark light" />
<meta name="robots" content="noindex" />
<title>404 Not Found</title>
</head>
<body>
<h1>404 Not Found</h1>
<hr>
<p>http request [https://pdf2.webgetstore.com/2026/06/03/31f6781928e275a74c1ecf0b45201adc.webp?sg=a326bc10d2a1fdab982779749251d32c&amp;e=6a1f06b0&amp;fileName=IMG_20190602_082558.webp&amp;fi=288933356] failure,status: 404|Not Found response:&lt;!DOCTYPE HTML PUBLIC &#34;-//IETF//DTD HTML 2.0//EN&#34;&gt;
&lt;html&gt;
&lt;head&gt;
&lt;title&gt; 404&lt;/title&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;p&gt;404&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</p>
</body>
</html>
app/src/main/res/drawable/ic_blog.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 博客图标 - 火焰 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#EF4444"
android:pathData="M12,23c-4.97,0 -9,-3.58 -9,-8 0,-2.52 1.17,-5.32 3.22,-7.63C7.49,5.84 9.56,4 12,2c0.44,1.33 1.21,3.19 2.34,4.86C16.07,9.39 18,11.58 18,15c0,4.42 -4.03,8 -9,8z"/>
</vector>
app/src/main/res/drawable/ic_search.xml
+2 -2
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- 搜索图标 --> <!-- 搜索图标 - 深色 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp" android:width="20dp"
android:height="20dp" android:height="20dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:fillColor="#9CA3AF" android:fillColor="#1F2937"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector> </vector>
app/src/main/res/layout/activity_main.xml
+241 -133
View File
@@ -11,73 +11,68 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="24dp" android:padding="24dp"
android:layout_marginTop="16dp"> android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="早上好" android:text="早上好"
android:textSize="16sp" android:textSize="14sp"
android:textColor="#6B7280"/> android:textColor="#6B7280"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ARKJ" android:text="ARKJ"
android:textSize="32sp" android:textSize="28sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="#1F2937" android:textColor="#1F2937"
android:layout_marginTop="4dp"/> android:layout_marginTop="2dp"/>
</LinearLayout> </LinearLayout>
<!-- 搜索栏 --> <!-- 轮播图区域（含加载指示器） -->
<LinearLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="180dp"
android:orientation="horizontal" android:layout_marginHorizontal="24dp"
android:paddingHorizontal="24dp"
android:gravity="center_vertical"
android:layout_marginBottom="20dp"> android:layout_marginBottom="20dp">
<LinearLayout <!-- 加载指示器 -->
android:layout_width="0dp" <ProgressBar
android:layout_height="52dp" android:id="@+id/carouselLoading"
android:layout_weight="1" android:layout_width="wrap_content"
android:orientation="horizontal" android:layout_height="wrap_content"
android:background="@drawable/bg_search" android:layout_gravity="center"
android:paddingHorizontal="16dp" android:indeterminateTint="#6366F1"/>
android:gravity="center_vertical">
<ImageView <!-- WebView 初始隐藏，加载完成后显示 -->
android:layout_width="20dp" <WebView
android:layout_height="20dp" android:id="@+id/carouselWebView"
android:src="@drawable/ic_search"/> android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_carousel"
android:elevation="4dp"
android:visibility="invisible"/>
</FrameLayout>
<!-- 功能网格标题 -->
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/search_hint" android:text="功能"
android:textColor="#9CA3AF" android:textSize="18sp"
android:textSize="15sp" android:textStyle="bold"
android:layout_marginStart="12dp"/> android:textColor="#1F2937"
</LinearLayout> android:layout_marginStart="24dp"
android:layout_marginBottom="12dp"/>
<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"/>
</LinearLayout>
<!-- 功能网格 --> <!-- 功能网格 -->
<GridLayout <GridLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1" android:rowCount="2"
android:rowCount="3" android:columnCount="4"
android:columnCount="3"
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:alignmentMode="alignMargins"> android:alignmentMode="alignMargins">
@@ -85,19 +80,17 @@
<LinearLayout <LinearLayout
android:id="@+id/btnMemo" android:id="@+id/btnMemo"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_memo"/> android:src="@drawable/ic_memo"/>
<TextView <TextView
@@ -105,27 +98,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/memo" android:text="@string/memo"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
<!-- 二维码 --> <!-- 二维码 -->
<LinearLayout <LinearLayout
android:id="@+id/btnQRCode" android:id="@+id/btnQRCode"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_qrcode"/> android:src="@drawable/ic_qrcode"/>
<TextView <TextView
@@ -133,27 +124,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/qrcode" android:text="@string/qrcode"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
<!-- 谁在干活 --> <!-- 谁在干活 -->
<LinearLayout <LinearLayout
android:id="@+id/btnWhoWorking" android:id="@+id/btnWhoWorking"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_star"/> android:src="@drawable/ic_star"/>
<TextView <TextView
@@ -161,27 +150,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/who_working" android:text="@string/who_working"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
<!-- PVE --> <!-- PVE -->
<LinearLayout <LinearLayout
android:id="@+id/btnPVE" android:id="@+id/btnPVE"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_pve"/> android:src="@drawable/ic_pve"/>
<TextView <TextView
@@ -189,27 +176,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pve" android:text="@string/pve"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
<!-- 快递 --> <!-- 快递 -->
<LinearLayout <LinearLayout
android:id="@+id/btnExpress" android:id="@+id/btnExpress"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_express"/> android:src="@drawable/ic_express"/>
<TextView <TextView
@@ -217,27 +202,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/express" android:text="@string/express"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
<!-- 纪念日 --> <!-- 纪念日 -->
<LinearLayout <LinearLayout
android:id="@+id/btnAnniversary" android:id="@+id/btnAnniversary"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_anniversary"/> android:src="@drawable/ic_anniversary"/>
<TextView <TextView
@@ -245,27 +228,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/anniversary" android:text="@string/anniversary"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
<!-- 记账 --> <!-- 记账 -->
<LinearLayout <LinearLayout
android:id="@+id/btnAccounting" android:id="@+id/btnAccounting"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_accounting"/> android:src="@drawable/ic_accounting"/>
<TextView <TextView
@@ -273,55 +254,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/accounting" android:text="@string/accounting"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout>
<!-- 资料 -->
<LinearLayout
android:id="@+id/btnMaterials"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical"
android:gravity="center"
android:background="@drawable/bg_function_icon"
android:layout_margin="8dp"
android:clickable="true"
android:focusable="true">
<ImageView
android:layout_width="52dp"
android:layout_height="52dp"
android:src="@drawable/ic_materials"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/materials"
android:textColor="#374151"
android:textSize="14sp"
android:layout_marginTop="8dp"/>
</LinearLayout> </LinearLayout>
<!-- 更多 --> <!-- 更多 -->
<LinearLayout <LinearLayout
android:id="@+id/btnMore" android:id="@+id/btnMore"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_columnWeight="1"
android:layout_rowWeight="1"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_function_icon" android:padding="12dp"
android:layout_margin="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="52dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="48dp"
android:src="@drawable/ic_more"/> android:src="@drawable/ic_more"/>
<TextView <TextView
@@ -329,11 +280,167 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="更多" android:text="更多"
android:textColor="#374151" android:textColor="#374151"
android:textSize="14sp" android:textSize="13sp"
android:layout_marginTop="8dp"/> android:layout_marginTop="6dp"/>
</LinearLayout> </LinearLayout>
</GridLayout> </GridLayout>
<!-- 博客标题 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="12dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_blog"
android:layout_marginEnd="8dp"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/blog_title"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="#1F2937"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="更多 >"
android:textColor="#6366F1"
android:textSize="14sp"
android:clickable="true"
android:focusable="true"/>
</LinearLayout>
<!-- 博客列表占位 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:layout_marginBottom="80dp">
<!-- 博客占位 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: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>
<!-- 博客占位 2 -->
<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>
<!-- 博客占位 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
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -343,7 +450,8 @@
android:padding="12dp" android:padding="12dp"
android:background="@drawable/bg_menu_button" android:background="@drawable/bg_menu_button"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginBottom="16dp"> android:layout_marginBottom="16dp"
android:elevation="8dp">
<LinearLayout <LinearLayout
android:id="@+id/navHome" android:id="@+id/navHome"