Skip to content

ethan / appframe

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 4d183d79 by tanghuan
Options

Merge branch 'feature-2606-pad' into pad-feature-2607 

# Conflicts:
#	lib/bloc/web_cubit.dart
#	lib/ui/pages/web_page.dart
2 parents 780ef5a7 3c3991bc
Expand all
Inline Side-by-side
Showing 144 changed files with 195 additions and 174 deletions
android/app/src/main/AndroidManifest.xml
......@@ -18,6 +18,9 @@
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<!-- APP 自动更新：安装未知来源应用 -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<application
android:label="班小二"
......@@ -26,6 +29,7 @@
android:networkSecurityConfig="@xml/network_security_config">
<!-- 隐私政策Activity - 启动入口 -->
<!--
<activity
android:name=".PrivacyActivity"
android:exported="true"
......@@ -36,6 +40,7 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
-->
<activity
android:name=".MainActivity"
......@@ -53,6 +58,10 @@
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
......
android/app/src/main/java/cn/banxe/bxe/PrivacyActivity.java
......@@ -5,6 +5,7 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.drawable.GradientDrawable;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
......@@ -16,6 +17,7 @@ import android.text.style.ClickableSpan;
import android.view.Gravity;
import android.view.View;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -62,30 +64,37 @@ public class PrivacyActivity extends Activity {
}
private View createContentView() {
// 根布局
LinearLayout rootLayout = new LinearLayout(this);
rootLayout.setOrientation(LinearLayout.VERTICAL);
rootLayout.setGravity(Gravity.CENTER_VERTICAL);
rootLayout.setPadding(dpToPx(32), dpToPx(48), dpToPx(32), dpToPx(48));
// 外层根布局（浅灰色背景，垂直居中）
FrameLayout rootLayout = new FrameLayout(this);
rootLayout.setBackgroundColor(0xFFFFFFFF);
// 内容容器
LinearLayout contentLayout = new LinearLayout(this);
contentLayout.setOrientation(LinearLayout.VERTICAL);
LinearLayout.LayoutParams contentLayoutParams = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
rootLayout.addView(contentLayout, contentLayoutParams);
// 卡片容器（白色圆角卡片）
LinearLayout cardLayout = new LinearLayout(this);
cardLayout.setOrientation(LinearLayout.VERTICAL);
cardLayout.setPadding(dpToPx(28), dpToPx(36), dpToPx(28), dpToPx(36));
GradientDrawable cardBg = new GradientDrawable();
cardBg.setColor(0xFFFFFFFF);
cardBg.setCornerRadius(dpToPx(16));
cardLayout.setBackground(cardBg);
FrameLayout.LayoutParams cardParams = new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.WRAP_CONTENT);
int cardMarginH = dpToPx(24);
int cardMarginV = dpToPx(80);
cardParams.setMargins(cardMarginH, cardMarginV, cardMarginH, cardMarginV);
cardParams.gravity = Gravity.CENTER_VERTICAL;
rootLayout.addView(cardLayout, cardParams);
// 标题
TextView titleView = new TextView(this);
titleView.setText("用户协议与隐私政策");
titleView.setTextSize(22);
titleView.setTextSize(23);
titleView.setTextColor(0xFF333333);
titleView.setTypeface(null, Typeface.BOLD);
titleView.setGravity(Gravity.CENTER);
titleView.setPadding(0, 0, 0, dpToPx(32));
contentLayout.addView(titleView);
titleView.setPadding(0, 0, 0, dpToPx(28));
cardLayout.addView(titleView);
// 内容（带可点击链接）
TextView contentView = new TextView(this);
......@@ -93,10 +102,10 @@ public class PrivacyActivity extends Activity {
contentView.setMovementMethod(LinkMovementMethod.getInstance());
contentView.setHighlightColor(0x00000000);
contentView.setTextSize(17);
contentView.setTextColor(0xFF666666);
contentView.setTextColor(0xFF555555);
contentView.setLineSpacing(dpToPx(6), 1.0f);
contentView.setGravity(Gravity.START);
contentLayout.addView(contentView);
cardLayout.addView(contentView);
// 按钮容器
LinearLayout buttonLayout = new LinearLayout(this);
......@@ -105,45 +114,51 @@ public class PrivacyActivity extends Activity {
LinearLayout.LayoutParams buttonLayoutParams = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
buttonLayoutParams.topMargin = dpToPx(48);
contentLayout.addView(buttonLayout, buttonLayoutParams);
buttonLayoutParams.topMargin = dpToPx(32);
cardLayout.addView(buttonLayout, buttonLayoutParams);
// 同意按钮
int btnHeight = dpToPx(44);
int btnRadius = dpToPx(22);
// 同意按钮（蓝紫色填充，大圆角）
Button agreeButton = new Button(this);
agreeButton.setText("同意");
agreeButton.setTextColor(0xFFFFFFFF);
agreeButton.setBackgroundColor(0xFF4CAF50);
agreeButton.setTextSize(16);
agreeButton.setTypeface(null, Typeface.BOLD);
agreeButton.setGravity(Gravity.CENTER);
agreeButton.setSingleLine(true);
agreeButton.setMinWidth(dpToPx(120));
agreeButton.setMinHeight(dpToPx(48));
int btnPaddingH = dpToPx(24);
int btnPaddingV = dpToPx(12);
agreeButton.setPadding(btnPaddingH, btnPaddingV, btnPaddingH, btnPaddingV);
agreeButton.setPadding(0, 0, 0, 0);
GradientDrawable agreeBg = new GradientDrawable();
agreeBg.setColor(0xFF7691FA);
agreeBg.setCornerRadius(btnRadius);
agreeButton.setBackground(agreeBg);
agreeButton.setOnClickListener(v -> onAgreeClicked());
LinearLayout.LayoutParams agreeParams = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
agreeParams.setMargins(dpToPx(16), 0, dpToPx(16), 0);
0,
btnHeight,
1.0f);
agreeParams.setMargins(0, 0, dpToPx(8), 0);
buttonLayout.addView(agreeButton, agreeParams);
// 不同意按钮
// 不同意按钮（灰色描边，大圆角）
Button disagreeButton = new Button(this);
disagreeButton.setText("不同意");
disagreeButton.setTextColor(0xFF666666);
disagreeButton.setBackgroundColor(0xFFEEEEEE);
disagreeButton.setTextSize(16);
disagreeButton.setGravity(Gravity.CENTER);
disagreeButton.setSingleLine(true);
disagreeButton.setMinWidth(dpToPx(120));
disagreeButton.setMinHeight(dpToPx(48));
disagreeButton.setPadding(btnPaddingH, btnPaddingV, btnPaddingH, btnPaddingV);
disagreeButton.setPadding(0, 0, 0, 0);
GradientDrawable disagreeBg = new GradientDrawable();
disagreeBg.setColor(0xFFF5F6FA);
disagreeBg.setCornerRadius(btnRadius);
disagreeButton.setBackground(disagreeBg);
disagreeButton.setOnClickListener(v -> onDisagreeClicked());
LinearLayout.LayoutParams disagreeParams = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
disagreeParams.setMargins(dpToPx(16), 0, dpToPx(16), 0);
0,
btnHeight,
1.0f);
disagreeParams.setMargins(dpToPx(8), 0, 0, 0);
buttonLayout.addView(disagreeButton, disagreeParams);
return rootLayout;
......@@ -172,7 +187,7 @@ public class PrivacyActivity extends Activity {
@Override
public void updateDrawState(TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(0xFF4CAF50);
ds.setColor(0xFF7691FA);
ds.setUnderlineText(true);
}
}, userAgreementStart, userAgreementEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
......@@ -188,7 +203,7 @@ public class PrivacyActivity extends Activity {
@Override
public void updateDrawState(TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(0xFF4CAF50);
ds.setColor(0xFF7691FA);
ds.setUnderlineText(true);
}
}, privacyPolicyStart, privacyPolicyEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
......
android/app/src/main/res/drawable-v21/launch_background.xml
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:colorBackground" />
<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
<item>
<bitmap android:gravity="fill" android:src="@drawable/background"/>
</item>
<item>
<bitmap android:gravity="center" android:src="@drawable/splash"/>
</item>
<item android:bottom="24dp">
<bitmap android:gravity="bottom" android:src="@drawable/branding"/>
</item>
</layer-list>
android/app/src/main/res/drawable/launch_background.xml
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" />
<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
<item>
<bitmap android:gravity="fill" android:src="@drawable/background"/>
</item>
<item>
<bitmap android:gravity="center" android:src="@drawable/splash"/>
</item>
<item android:bottom="24dp">
<bitmap android:gravity="bottom" android:src="@drawable/branding"/>
</item>
</layer-list>
android/app/src/main/res/values-night-v31/styles.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#FFFFFF</item>
<item name="android:windowSplashScreenBrandingImage">@drawable/android12branding</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenIconBackgroundColor">#FFFFFF</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
android/app/src/main/res/values-night/styles.xml
......@@ -5,6 +5,10 @@
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
......
android/app/src/main/res/values-v31/styles.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#FFFFFF</item>
<item name="android:windowSplashScreenBrandingImage">@drawable/android12branding</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenIconBackgroundColor">#FFFFFF</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
android/app/src/main/res/values/styles.xml
......@@ -5,6 +5,10 @@
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
......
lib/app.dart
......@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:appframe/l10n/gen/app_localizations.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'config/routes.dart';
......@@ -10,29 +11,41 @@ class App extends StatelessWidget {
const App({super.key});
@override
Widget build(BuildContext context) => Platform.isIOS
? CupertinoApp.router(
routerConfig: router,
title: '班小二',
theme: const CupertinoThemeData(primaryColor: CupertinoColors.systemBlue),
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
// // === 为 iOS 添加本地化配置 ===
// localizationsDelegates: const [
// GlobalMaterialLocalizations.delegate, // 为Material组件提供本地化
// GlobalCupertinoLocalizations.delegate, // 为Cupertino组件提供本地化
// GlobalWidgetsLocalizations.delegate, // 定义文本方向等
// ],
// supportedLocales: const [
// Locale('zh', 'CN'), // 中文（中国）
// Locale('en', 'US'), // 英语（美国）
// ],
)
: MaterialApp.router(
routerConfig: router,
title: '班小二',
theme: ThemeData(primarySwatch: Colors.blue),
supportedLocales: AppLocalizations.supportedLocales,
localizationsDelegates: AppLocalizations.localizationsDelegates,
);
Widget build(BuildContext context) {
final Widget app = Platform.isIOS
? CupertinoApp.router(
routerConfig: router,
title: '班小二',
theme: const CupertinoThemeData(primaryColor: CupertinoColors.systemBlue),
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
)
: MaterialApp.router(
routerConfig: router,
title: '班小二',
theme: ThemeData(primarySwatch: Colors.blue),
supportedLocales: AppLocalizations.supportedLocales,
localizationsDelegates: AppLocalizations.localizationsDelegates,
// Android edge-to-edge 模式下虚拟导航键叠在内容上方，
// 通过 builder 统一包裹 SafeArea，所有路由页面自动适配底部安全区域。
builder: (context, child) => ColoredBox(
color: Colors.white,
child: SafeArea(top: false, child: child!),
),
);
// 全局默认状态栏样式兑底：透明背景 + 深色图标。
// 作为最外层 AnnotatedRegion 只挂载一次，不会随页面状态变化反复
// 下发命令，避免污染 Android decorView 上 H5 <video> 全屏依赖的
// systemUiVisibility flag。带 AppBar 的页面由 AppBar.systemOverlayStyle
// 在其 region 区域局部覆盖，隐藏 AppBar 后自动回到本全局值。
return AnnotatedRegion<SystemUiOverlayStyle>(
value: const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.dark,
statusBarBrightness: Brightness.light,
),
child: app,
);
}
}
lib/bloc/login_phone_cubit.dart
import 'dart:async';
import 'package:appframe/config/constant.dart';
import 'package:app_settings/app_settings.dart';
import 'package:appframe/config/locator.dart';
import 'package:appframe/config/routes.dart';
import 'package:appframe/data/repositories/phone_auth_repository.dart';
import 'package:appframe/utils/login_util.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
......@@ -102,7 +103,11 @@ class LoginPhoneCubit extends Cubit<LoginPhoneState> {
}
// 发送验证码
var result = await _phoneAuthRepository.verifyCode(phone, 0);
var result = await _phoneAuthRepository.verifyCode(phone, 1);
if (result == null) {
Fluttertoast.showToast(msg: '发送请求失败', gravity: ToastGravity.TOP, backgroundColor: Colors.red);
return;
}
if (result['code'] != 0) {
final err = result['error'] ?? '';
// 手机号未注册时，打开指引界面
......@@ -154,97 +159,15 @@ class LoginPhoneCubit extends Cubit<LoginPhoneState> {
}
var data = resultData['data'] as Map<String, dynamic>;
_handleLoginSuccess(data);
}
void _handleLoginSuccess(Map<String, dynamic> data) {
var roles = data['roles'];
// 过滤出家长角色的数据
if (roles?.isNotEmpty ?? false) {
roles.removeWhere((element) => element['userType'] != 2);
} else {
roles = [];
}
var sessionCode = data['sessionCode'];
var userCode = data['userCode'];
var classCode = '';
var userType = 0;
var stuId = '';
var className = '';
var stuName = '';
var relation = '';
var sharedPreferences = getIt.get<SharedPreferences>();
if (roles.isNotEmpty) {
var role = roles[0];
classCode = role['classCode'];
userType = role['userType'];
stuId = role['stuId'];
className = role['className'];
stuName = role['stuName'];
relation = role['relation'] ?? '';
// 将角色中的班级数据处理后，进行缓存
List<String> classIdList = [];
for (var role in roles) {
classIdList.add(role['classCode'] as String);
}
debugPrint('classCodeIds:-------------- $classIdList');
sharedPreferences.setStringList(Constant.classIdSetKey, classIdList);
} else {
sharedPreferences.setStringList(Constant.classIdSetKey, []);
}
var preUserCode = sharedPreferences.getString('pre_userCode') ?? '';
if (userCode != preUserCode) {
// 新用户登录
sharedPreferences.setString('pre_userCode', userCode);
sharedPreferences.setString('pre_classCode', classCode);
sharedPreferences.setInt('pre_userType', userType);
sharedPreferences.setString('pre_stuId', stuId);
} else {
// 前一个登录用户重新登录
var preClassCode = sharedPreferences.getString('pre_classCode') ?? '';
var preUserType = sharedPreferences.getInt('pre_userType') ?? 0;
var preStuId = sharedPreferences.getString('pre_stuId') ?? '';
if (preClassCode != '' &&
roles.any((element) =>
element['classCode'] == preClassCode &&
element['userType'] == preUserType &&
element['stuId'] == preStuId)) {
classCode = preClassCode;
userType = preUserType;
stuId = preStuId;
} else {
sharedPreferences.setString('pre_userCode', userCode);
sharedPreferences.setString('pre_classCode', classCode);
sharedPreferences.setInt('pre_userType', userType);
sharedPreferences.setString('pre_stuId', stuId);
}
int binding = resultData['binding'];
// binding=1 代表已绑定，不是游客
var visitor = binding == 1 ? 0 : 1;
if (visitor == 1) {
var sharedPreferences = getIt.get<SharedPreferences>();
sharedPreferences.setString('auth_visitor_type', 'phone');
sharedPreferences.setString('auth_visitor_id', phone);
}
sharedPreferences.setString('auth_sessionCode', sessionCode);
sharedPreferences.setString('auth_userCode', userCode);
sharedPreferences.setString('auth_classCode', classCode);
sharedPreferences.setInt('auth_userType', userType);
sharedPreferences.setString('auth_stuId', stuId);
sharedPreferences.setString('auth_className', className);
sharedPreferences.setString('auth_stuName', stuName);
sharedPreferences.setString('auth_relation', relation);
router.go(
'/web',
extra: {
'sessionCode': sessionCode,
'userCode': userCode,
'classCode': classCode,
'userType': userType,
'stuId': stuId,
},
);
LoginUtil.handleLoginSuccess(data, visitor, 'router');
}
void toggleAgreed(bool value) {
......@@ -272,6 +195,13 @@ class LoginPhoneCubit extends Cubit<LoginPhoneState> {
router.go('/loginQr');
}
Future<void> openWifiSettings() async {
await AppSettings.openAppSettings(
type: AppSettingsType.wifi,
asAnotherTask: false,
);
}
@override
Future<void> close() async {
try {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!