xt / Flutter-ReserveApp · Commits

Go to a project

Commit b896c22240f154b340a2661797320ac88586c126

Authored by wdn127929
2 parents 8f363ca9 a9a0dc49
build: skipped

合并更换logologo

Inline Side-by-side
Showing 13 changed files with 32 additions and 26 deletions
... ... @@ -18,11 +18,13 @@ if (flutterVersionCode == null) {
flutterVersionCode = '450'
}
def flutterVersionName = "4.5.0"
if (flutterVersionName == null) {
flutterVersionName = '4.5.0'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
... ...

2.73 KB | W: | H:

5.06 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.65 KB | W: | H:

2.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.38 KB | W: | H:

7.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.25 KB | W: | H:

14.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.21 KB | W: | H:

22.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

9.69 KB | W: | H:

40.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -167,7 +167,8 @@ class MyAppState extends State<MyApp> {
//初始化微信SDK
_initFluwx() async {
await registerWxApi(
appId: "wx85aa3cdd0f791e65",
// appId: "wx85aa3cdd0f791e65",
appId: "wx4d105e36a36a6139",
doOnAndroid: true,
doOnIOS: true,
universalLink: "https://xt04.colorcun.com/link/OneKey/");
... ...
... ... @@ -149,12 +149,12 @@ class AccountLoginPageState extends State<AccountLoginPage>
VEmptyView(30),
Row(
children: [
Image.asset(
"assets/logo.png",
width: ScreenUtil().setWidth(20 * 2),
height: ScreenUtil().setWidth(20 * 2),
),
HEmptyView(16),
// Image.asset(
// "assets/logo.png",
// width: ScreenUtil().setWidth(20 * 2),
// height: ScreenUtil().setWidth(20 * 2),
// ),
// HEmptyView(16),
Text(
'账号密码登录',
style: TextStyle(
... ...
... ... @@ -58,7 +58,8 @@ class _FirstPageState extends State<FirstPage> {
//初始化微信SDK
_initFluwx() async {
await registerWxApi(
appId: "wx85aa3cdd0f791e65",
// appId: "wx85aa3cdd0f791e65",
appId: "wx4d105e36a36a6139",
doOnAndroid: true,
doOnIOS: true,
universalLink: "https://xt04.colorcun.com/link/OneKey/");
... ...
... ... @@ -134,7 +134,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
}
}
//判断是否登录
//判断是否登录
void isLogin() async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.initUser();
... ... @@ -411,19 +411,20 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
children: <Widget>[
// VEmptyView(218 - App.statusBarHeight),
VEmptyView(80 + App.statusBarHeight),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40)),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Image.asset(
"assets/logo.png",
width: ScreenUtil().setWidth(40 * 2),
height: ScreenUtil().setWidth(40 * 2),
)
],
)),
// Padding(
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(40)),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.start,
// children: [
// Image.asset(
// "assets/logo.png",
// width: ScreenUtil().setWidth(40 * 2),
// height: ScreenUtil().setWidth(40 * 2),
// )
// ],
// )),
VEmptyView(80),
VEmptyView(120),
Image.asset(
Utils.getImgPath('login_bg'),
... ... @@ -792,7 +793,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
)),
onTap: () {
if (!_check) {
DialogUtil.openAlertDialogLogin(context, 500,
DialogUtil.openAlertDialogLogin(context, 530,
onTap: () {
Navigator.pop(context);
_wxLogin();
... ... @@ -829,7 +830,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
)),
onTap: () {
if (!_check) {
DialogUtil.openAlertDialogLogin(context, 500,
DialogUtil.openAlertDialogLogin(context, 530,
onTap: () {
Navigator.pop(context);
NavigatorUtil.goAccountLoginPage(context);
... ... @@ -875,7 +876,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
)),
onTap: () {
if (!_check) {
DialogUtil.openAlertDialogLogin(context, 500,
DialogUtil.openAlertDialogLogin(context, 530,
onTap: () {
Navigator.pop(context);
_iosLogin(value);
... ...
... ... @@ -5170,6 +5170,7 @@ class DialogUtil {
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)),
height: ScreenUtil().setWidth(height),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))),
child: Card(
... ...