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) { @@ -18,11 +18,13 @@ if (flutterVersionCode == null) {
18 flutterVersionCode = '450' 18 flutterVersionCode = '450'
19 } 19 }
20 20
  21 +
21 def flutterVersionName = "4.5.0" 22 def flutterVersionName = "4.5.0"
22 if (flutterVersionName == null) { 23 if (flutterVersionName == null) {
23 flutterVersionName = '4.5.0' 24 flutterVersionName = '4.5.0'
24 -  
25 } 25 }
  26 +
  27 +
26 apply plugin: 'com.android.application' 28 apply plugin: 'com.android.application'
27 apply plugin: 'kotlin-android' 29 apply plugin: 'kotlin-android'
28 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" 30 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> { @@ -167,7 +167,8 @@ class MyAppState extends State<MyApp> {
167 //初始化微信SDK 167 //初始化微信SDK
168 _initFluwx() async { 168 _initFluwx() async {
169 await registerWxApi( 169 await registerWxApi(
170 - appId: "wx85aa3cdd0f791e65", 170 + // appId: "wx85aa3cdd0f791e65",
  171 + appId: "wx4d105e36a36a6139",
171 doOnAndroid: true, 172 doOnAndroid: true,
172 doOnIOS: true, 173 doOnIOS: true,
173 universalLink: "https://xt04.colorcun.com/link/OneKey/"); 174 universalLink: "https://xt04.colorcun.com/link/OneKey/");
@@ -149,12 +149,12 @@ class AccountLoginPageState extends State<AccountLoginPage> @@ -149,12 +149,12 @@ class AccountLoginPageState extends State<AccountLoginPage>
149 VEmptyView(30), 149 VEmptyView(30),
150 Row( 150 Row(
151 children: [ 151 children: [
152 - Image.asset(  
153 - "assets/logo.png",  
154 - width: ScreenUtil().setWidth(20 * 2),  
155 - height: ScreenUtil().setWidth(20 * 2),  
156 - ),  
157 - HEmptyView(16), 152 + // Image.asset(
  153 + // "assets/logo.png",
  154 + // width: ScreenUtil().setWidth(20 * 2),
  155 + // height: ScreenUtil().setWidth(20 * 2),
  156 + // ),
  157 + // HEmptyView(16),
158 Text( 158 Text(
159 '账号密码登录', 159 '账号密码登录',
160 style: TextStyle( 160 style: TextStyle(
@@ -58,7 +58,8 @@ class _FirstPageState extends State<FirstPage> { @@ -58,7 +58,8 @@ class _FirstPageState extends State<FirstPage> {
58 //初始化微信SDK 58 //初始化微信SDK
59 _initFluwx() async { 59 _initFluwx() async {
60 await registerWxApi( 60 await registerWxApi(
61 - appId: "wx85aa3cdd0f791e65", 61 + // appId: "wx85aa3cdd0f791e65",
  62 + appId: "wx4d105e36a36a6139",
62 doOnAndroid: true, 63 doOnAndroid: true,
63 doOnIOS: true, 64 doOnIOS: true,
64 universalLink: "https://xt04.colorcun.com/link/OneKey/"); 65 universalLink: "https://xt04.colorcun.com/link/OneKey/");
@@ -134,7 +134,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -134,7 +134,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
134 } 134 }
135 } 135 }
136 136
137 - //判断是否登录 137 + //判断是否登录
138 void isLogin() async { 138 void isLogin() async {
139 UserModel userModel = Provider.of<UserModel>(context, listen: false); 139 UserModel userModel = Provider.of<UserModel>(context, listen: false);
140 userModel.initUser(); 140 userModel.initUser();
@@ -411,19 +411,20 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -411,19 +411,20 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
411 children: <Widget>[ 411 children: <Widget>[
412 // VEmptyView(218 - App.statusBarHeight), 412 // VEmptyView(218 - App.statusBarHeight),
413 VEmptyView(80 + App.statusBarHeight), 413 VEmptyView(80 + App.statusBarHeight),
414 - Padding(  
415 - padding: EdgeInsets.symmetric(  
416 - horizontal: ScreenUtil().setWidth(40)),  
417 - child: Row(  
418 - mainAxisAlignment: MainAxisAlignment.start,  
419 - children: [  
420 - Image.asset(  
421 - "assets/logo.png",  
422 - width: ScreenUtil().setWidth(40 * 2),  
423 - height: ScreenUtil().setWidth(40 * 2),  
424 - )  
425 - ],  
426 - )), 414 + // Padding(
  415 + // padding: EdgeInsets.symmetric(
  416 + // horizontal: ScreenUtil().setWidth(40)),
  417 + // child: Row(
  418 + // mainAxisAlignment: MainAxisAlignment.start,
  419 + // children: [
  420 + // Image.asset(
  421 + // "assets/logo.png",
  422 + // width: ScreenUtil().setWidth(40 * 2),
  423 + // height: ScreenUtil().setWidth(40 * 2),
  424 + // )
  425 + // ],
  426 + // )),
  427 + VEmptyView(80),
427 VEmptyView(120), 428 VEmptyView(120),
428 Image.asset( 429 Image.asset(
429 Utils.getImgPath('login_bg'), 430 Utils.getImgPath('login_bg'),
@@ -792,7 +793,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -792,7 +793,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
792 )), 793 )),
793 onTap: () { 794 onTap: () {
794 if (!_check) { 795 if (!_check) {
795 - DialogUtil.openAlertDialogLogin(context, 500, 796 + DialogUtil.openAlertDialogLogin(context, 530,
796 onTap: () { 797 onTap: () {
797 Navigator.pop(context); 798 Navigator.pop(context);
798 _wxLogin(); 799 _wxLogin();
@@ -829,7 +830,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -829,7 +830,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
829 )), 830 )),
830 onTap: () { 831 onTap: () {
831 if (!_check) { 832 if (!_check) {
832 - DialogUtil.openAlertDialogLogin(context, 500, 833 + DialogUtil.openAlertDialogLogin(context, 530,
833 onTap: () { 834 onTap: () {
834 Navigator.pop(context); 835 Navigator.pop(context);
835 NavigatorUtil.goAccountLoginPage(context); 836 NavigatorUtil.goAccountLoginPage(context);
@@ -875,7 +876,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -875,7 +876,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
875 )), 876 )),
876 onTap: () { 877 onTap: () {
877 if (!_check) { 878 if (!_check) {
878 - DialogUtil.openAlertDialogLogin(context, 500, 879 + DialogUtil.openAlertDialogLogin(context, 530,
879 onTap: () { 880 onTap: () {
880 Navigator.pop(context); 881 Navigator.pop(context);
881 _iosLogin(value); 882 _iosLogin(value);
@@ -5170,6 +5170,7 @@ class DialogUtil { @@ -5170,6 +5170,7 @@ class DialogUtil {
5170 padding: 5170 padding:
5171 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)), 5171 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)),
5172 height: ScreenUtil().setWidth(height), 5172 height: ScreenUtil().setWidth(height),
  5173 +
5173 decoration: BoxDecoration( 5174 decoration: BoxDecoration(
5174 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))), 5175 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))),
5175 child: Card( 5176 child: Card(