Commit a541d07bd17b0f3222a7435f9eebb48da0fa604d

Authored by wdn127929
1 parent c37f87db

新建分支2.3

... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "225"
def flutterVersionCode = "226"
if (flutterVersionCode == null) {
flutterVersionCode = '225'
flutterVersionCode = '226'
}
def flutterVersionName = "2.2.5"
def flutterVersionName = "2.2.6"
if (flutterVersionName == null) {
flutterVersionName = '2.2.5'
flutterVersionName = '2.2.6'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -472,7 +472,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 225;
CURRENT_PROJECT_VERSION = 220;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -487,7 +487,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.2.5;
MARKETING_VERSION = 2.2.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -616,7 +616,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 225;
CURRENT_PROJECT_VERSION = 220;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -631,7 +631,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.2.5;
MARKETING_VERSION = 2.2.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -651,7 +651,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 225;
CURRENT_PROJECT_VERSION = 220;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -666,7 +666,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.2.5;
MARKETING_VERSION = 2.2.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -61,7 +61,7 @@
<key>NSContactsUsageDescription</key>
<string>允许访问您的通讯录来一键录入联系人</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>需要您的同意,APP才能在使用期间访问位置</string>
<string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
<key>NSMotionUsageDescription</key>
<string>需要您的同意,APP才能访问运动与健身</string>
<key>NSPhotoLibraryUsageDescription</key>
... ...
... ... @@ -93,9 +93,6 @@ Future<void> main() async {
ChangeNotifierProvider<UploadImageProvider>(
create: (_) => UploadImageProvider(),
),
ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
),
ChangeNotifierProvider<CreateStoreModel>(
create: (_) => CreateStoreModel(),
),
... ...
... ... @@ -5,6 +5,7 @@ import 'package:common_utils/common_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/app.dart';
import 'package:one_key/pages/message/message_page.dart';
import 'package:one_key/pages/my/my_page.dart';
... ...
... ... @@ -290,7 +290,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
}
///苹果登陆
_iosLogin() async {
_iosLogin(UserModel value) async {
String info = await Utils.getDeviceInfoSystem();
int systemInfo = info.compareTo('13');
if (systemInfo < 0) {
... ... @@ -311,8 +311,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
),
);
// _showLoading(context);
print(credential.userIdentifier);
NavigatorUtil.goBindingPhonePage(context, wechat: false);
// print(credential.userIdentifier);
_loginAppleData(value);
// NavigatorUtil.goBindingPhonePage(context, wechat: false);
// String mdString = Utils.generateMd5(credential.userIdentifier);
// String temp = mdString.substring(8, mdString.length - 2);
// String openid = 'IOSID_$temp';
... ... @@ -344,6 +345,25 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
// }
}
_loginAppleData(UserModel value) {
if (App.sp.containsKey('unionid')) {
//微信登陆的时候,退出清空数据
App.sp.remove('openid');
App.sp.remove("unionid");
}
Map<String, String> params = {
"seller_code": "001297",
"alias": "ssahdahgdafgahjkhakjgh",
"account": "0001",
"password": "123456"
};
value.login(context, params).then((value) {
// setState(() {
// // errorText = value ?? "";
// });
});
}
@override
Widget build(BuildContext context) {
ScreenUtil.init(context, width: 750, height: 1334);
... ... @@ -700,16 +720,19 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
children: <Widget>[
Platform.isAndroid
? Text('')
: InkWell(
child: Image.asset(Utils.getImgPath('apple'),
width: ScreenUtil().setWidth(100)),
onTap: () {
if (!_check) {
Utils.showToast('请仔细阅读协议');
return;
}
_iosLogin();
}),
: Consumer<UserModel>(builder: (BuildContext context,
UserModel value, Widget child) {
return InkWell(
child: Image.asset(Utils.getImgPath('apple'),
width: ScreenUtil().setWidth(100)),
onTap: () {
if (!_check) {
Utils.showToast('请仔细阅读协议');
return;
}
_iosLogin(value);
});
}),
Offstage(
offstage: !App.isInstallWx,
child: InkWell(
... ...
... ... @@ -103,6 +103,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
}
bool isSuccess =
await _baseIndoProvider.setCustomerActivityBaseinfo(context, params);
// _baseIndoProvider.baseInfoSunModel = null;
if (isSuccess) {
_uploadImageProvider.touxiang.file = null;
_uploadImageProvider.erweima.file = null;
... ...
... ... @@ -81,17 +81,19 @@ class NoteBookPageState extends State<NoteBookPage> {
userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;
noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;
if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
morning.split("-")[1] +
":00"))) {
if (morning != '' &&
dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
morning.split("-")[1] +
":00"))) {
//未过早市
currTimeIndex = 1;
} else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
} else if (noon != '' &&
dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
... ... @@ -109,7 +111,8 @@ class NoteBookPageState extends State<NoteBookPage> {
":00"))) {
//过了早市,未过午市
currTimeIndex = 2;
} else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
} else if (night != '' &&
dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
... ...
... ... @@ -401,9 +401,14 @@ class TableManagerModel with ChangeNotifier {
area.count = count;
areas.add(area);
}
currentArea = areaTableMap.keys.first;
currentTables = areaTableMap[currentArea];
pageState = PageState.Success;
if (areaTableMap.isNotEmpty) {
currentArea = areaTableMap.keys.first;
currentTables = areaTableMap[currentArea];
pageState = PageState.Success;
} else {
pageState = PageState.Empty;
}
notifyListeners();
}
... ...
... ... @@ -71,7 +71,7 @@ class UserModel with ChangeNotifier {
"noon": "",
"night": "",
};
saveUserInfo(User.fromJson(userMap));
await saveUserInfo(User.fromJson(userMap));
return getSellerInfo(
context,
{"seller_id": seller['id'], "seller_openid": seller['openid']},
... ... @@ -101,7 +101,7 @@ class UserModel with ChangeNotifier {
user['morning'] = daily['morning'];
user['noon'] = daily['noon'];
user['night'] = daily['night'];
saveUserInfo(User.fromJson(user));
await saveUserInfo(User.fromJson(user));
App.sp.setBool("isLogin", true);
App.sp.setString("is_call_tel", seller['is_call_tel'].toString());
NavigatorUtil.goHomePage(context);
... ...
... ... @@ -41,6 +41,7 @@ import 'package:one_key/pages/online_check/online_check_edit_page.dart';
import 'package:one_key/pages/sms/sms_page.dart';
import 'package:one_key/pages/table/select_table_page.dart';
import 'package:one_key/pages/webview/webview_page.dart';
import 'package:one_key/provider/base_info_provider.dart';
import 'package:one_key/provider/book_set_time_model.dart';
import 'package:one_key/provider/choose_table_model.dart';
import 'package:one_key/provider/create_store_model.dart';
... ... @@ -131,7 +132,9 @@ var handleInvicationHandler = new Handler(
String ddateStr =
FluroConvertUtils.fluroCnParamsDecode(params["ddateStr"].first);
String phone = params["phone"].first;
return InvicationPage(rid, tableInfo, ddate, ddateStr, phone);
return ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: InvicationPage(rid, tableInfo, ddate, ddateStr, phone));
});
// 发短信
... ... @@ -285,8 +288,10 @@ var baseInfoPageHandler = new Handler(
// CouponSunModel couponSunModel = CouponSunModel.fromJson(json.decode(
// FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
return ChangeNotifierProvider<UploadImageProvider>(
create: (_) => UploadImageProvider(), child: BaseInfoPage());
return ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: ChangeNotifierProvider<UploadImageProvider>(
create: (_) => UploadImageProvider(), child: BaseInfoPage()));
});
///绑定手机号码页面
... ...
... ... @@ -904,7 +904,7 @@ packages:
name: sign_in_with_apple
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.5.4"
version: "3.0.0"
simple_gesture_detector:
dependency: transitive
description:
... ... @@ -1159,4 +1159,4 @@ packages:
version: "2.2.1"
sdks:
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.20.0"
flutter: ">=2.0.0"
... ...
... ... @@ -99,7 +99,7 @@ dependencies:
#多图选择
photo: ^0.4.8
#苹果登陆
sign_in_with_apple: ^2.5.1
sign_in_with_apple: ^3.0.0
# sign_in_with_apple: ^3.0.0
# video_thumbnail: ^0.2.5
video_player: ^1.0.1
... ...