xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0b4687d1afe3dbc64f1d12a6f2d2cdb86aa3b4a0

Authored by wdn127929
1 parent db102ddb
build: skipped

苹果token需做本地缓存

Inline Side-by-side
Showing 8 changed files with 64 additions and 20 deletions
... ... @@ -17,9 +17,9 @@ if (flutterRoot == null) {
def flutterVersionCode = "497"
def flutterVersionCode = "498"
if (flutterVersionCode == null) {
flutterVersionCode = '497'
flutterVersionCode = '498'
}
... ... @@ -28,9 +28,9 @@ if (flutterVersionCode == null) {
def flutterVersionName = "4.9.7"
def flutterVersionName = "4.9.8"
if (flutterVersionName == null) {
flutterVersionName = '4.9.7'
flutterVersionName = '4.9.8'
}
... ...
... ... @@ -525,7 +525,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.9.7;
MARKETING_VERSION = 4.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -671,7 +671,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.9.7;
MARKETING_VERSION = 4.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -707,7 +707,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.9.7;
MARKETING_VERSION = 4.9.8;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -24,6 +24,8 @@ class User {
String nickName; // 昵称
String edate; //店铺过期日期
String tokenLoginOut; //信鸽token
User(
this.openid,
this.account,
... ... @@ -43,7 +45,8 @@ class User {
this.userphone,
this.token,
this.nickName,
this.edate);
this.edate,
this.tokenLoginOut);
factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
... ... @@ -51,6 +54,6 @@ class User {
@override
String toString() {
return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername,sellerimage:$sellerimage, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone,token:$token,nickName:$nickName,edate:$edate}';
return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername,sellerimage:$sellerimage, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone,token:$token,nickName:$nickName,edate:$edate},tokenLoginOut:${tokenLoginOut}';
}
}
... ...
... ... @@ -27,6 +27,7 @@ User _$UserFromJson(Map<String, dynamic> json) {
json['token'] as String,
json['nickname'] as String,
json['edate'] as String,
json['tokenLoginOut'] as String
);
}
... ... @@ -49,5 +50,6 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
'userphone': instance.userphone,
'token': instance.token,
'nickname': instance.nickName,
'edate': instance.edate
'edate': instance.edate,
'tokenLoginOut':instance.tokenLoginOut
};
... ...
... ... @@ -152,7 +152,8 @@ class _FeastPageState extends State<FeastPage> {
}
}),
feastModel.beFollowData != null &&
feastModel.beFollowData.length > 0
feastModel.beFollowData.length > 0 &&
(Utils.getAuthority(context, '待跟进'))
? Positioned(
right: ScreenUtil().setWidth(0),
bottom: ScreenUtil().setWidth(38),
... ...
... ... @@ -48,6 +48,7 @@ import '../../models/user.dart';
import '../../provider/feast_model.dart';
import '../../provider/remark_manager_model.dart';
import '../../provider/store_base_info_provider.dart';
import '../../utils/event_bus.dart';
import '../../utils/screen_util.dart';
import '../feast/feast_page.dart';
... ... @@ -184,6 +185,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
create: (_) => StoreBaseIndoProvider(), child: MyPage()),
));
WidgetsBinding.instance.addPostFrameCallback((_) {
bus.on('refresh_token', (arg) {
initPlatformState();
});
initPlatformState();
_getTableList();
_getSellerById();
... ... @@ -914,15 +918,26 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
}
//初始化推送token
userTokenInit(String token) {
userTokenInit(String token) async {
// userModel.token = token;
// userModel.tokenLoginOut =
// Platform.isAndroid ? "Android_$token" : "Ios_$token";
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.token = token;
Map<String, String> params = {
"sid": userModel.user.sellerid,
"account": userModel.user.account,
"user_token": Platform.isAndroid ? "Android_$token" : "Ios_$token"
};
userModel.userTokenInit(context, params);
if (App.sp.containsKey('user')) {
String s = App.sp.getString('user');
User _user = User.fromJson(json.decode(s));
_user.tokenLoginOut =
Platform.isAndroid ? "Android_$token" : "Ios_$token";
await UserModel().saveUserInfo(_user);
}
}
// 消息类型ID 1/2/10 提前点餐/新订单（预定）消息/在线预订
... ... @@ -1102,7 +1117,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
Positioned(
top: -8,
right: -8,
child: _getUnMsgNumUI()
child: _getUnMsgNumUI() &&
(Utils.getAuthority(context, '消息中心'))
? Container(
constraints: BoxConstraints(
minWidth: ScreenUtil().setWidth(36)),
... ... @@ -1147,7 +1163,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
Positioned(
top: -8,
right: -8,
child: _getUnMsgNumUI()
child: _getUnMsgNumUI() &&
(Utils.getAuthority(context, '消息中心'))
? Container(
constraints: BoxConstraints(
minWidth: ScreenUtil().setWidth(36)),
... ... @@ -1409,6 +1426,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// TODO: implement dispose
super.dispose();
LogUtil.v("home_dispose");
bus.off('refresh_token');
if (timer != null) {
timer.cancel();
}
... ...
import 'dart:convert';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:dotted_border/dotted_border.dart';
... ... @@ -135,6 +136,9 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
_loginStore(context, CheckSellerAccSunModel sunModel) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
App.sp.setBool("accountLogin", false);
if (Platform.isIOS) {
XgFlutterPlugin().stopXg();
}
if (App.sp.containsKey('table_list')) {
//退出清空桌位数据
App.sp.remove('table_list');
... ... @@ -148,6 +152,7 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
//退出清空店铺过期数据缓存
App.sp.remove('sellerEdate');
}
bus.emit('refresh_token');
Map<String, dynamic> seller = sunModel.toJson();
Map<String, dynamic> userMap = {
"openid": seller['uid'],
... ...
... ... @@ -25,7 +25,9 @@ import '../models/set_xuan_tai_model.dart';
class UserModel with ChangeNotifier {
String _registrationId; //极光推送registrationId
String _token; //信鸽推送token
// String token; //信鸽推送token
// String tokenLoginOut; //信鸽推送token+前缀
List<PullMarketingByUidSunModel> pullMarketingByUidSunModel;
// bool accountLogin = false;
... ... @@ -45,11 +47,17 @@ class UserModel with ChangeNotifier {
String get registrationId => _registrationId;
String get token => _token;
// String get token => _token;
set token(String value) {
_token = value;
}
// String get tokenLoginOut => _tokenLoginOut;
// set token(String value) {
// _token = value;
// }
// set tokenLoginOut(String value) {
// tokenLoginOut = value;
// }
/// 初始化 User
// void initUser() {
... ... @@ -332,6 +340,9 @@ class UserModel with ChangeNotifier {
///退出登录
loginOut(BuildContext context, Map<String, String> params) async {
params['token'] =
Provider.of<UserModel>(context, listen: false).user.tokenLoginOut;
print(params);
BaseResp<int> baseResp = await DioUtil()
.request<int>(context, Method.get, HttpUrl.login_out, data: params)
.catchError((error) {
... ... @@ -372,6 +383,9 @@ class UserModel with ChangeNotifier {
///切换店铺时的退出登录
Future<bool> loginOutOnly(
BuildContext context, Map<String, String> params) async {
params['token'] =
Provider.of<UserModel>(context, listen: false).user.tokenLoginOut;
print(params);
BaseResp<int> baseResp = await DioUtil()
.request<int>(context, Method.get, HttpUrl.login_out, data: params)
.catchError((error) {
... ...