xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2a73af4847df5805e1b6d0d92a534e3c87754edf

Authored by wdn127929
1 parent fd57a2e8
build: skipped

打包以前版本

Inline Side-by-side
Showing 6 changed files with 206 additions and 76 deletions
... ... @@ -15,8 +15,8 @@ class Constant {
// };
static const bool simpleApp = true; //极速版
// static const bool simpleApp = false; //标准版
static const bool normalApp = true; //屏蔽极速版，打包正常版本
// static const bool normalApp = false; //极速和正常版本
static const Map<String, List<String>> authorityConfig = {
'充值短信': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
'有效期': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
... ...
... ... @@ -14,6 +14,7 @@ import 'package:one_key/models/new_unmessage_model.dart';
import 'package:one_key/models/pull_marketing_by_uid_model.dart';
import 'package:one_key/pages/message/message_page.dart';
import 'package:one_key/pages/my/contant_left_page.dart';
import 'package:one_key/pages/my/my_page.dart';
import 'package:one_key/pages/notebook/notebook_page.dart';
import 'package:one_key/pages/table/table_manager_page.dart';
... ... @@ -40,6 +41,7 @@ import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
import 'package:flutter_app_badger/flutter_app_badger.dart';
import 'package:one_key/models/message.dart';
import '../../constant/constant.dart';
import '../../constant/state.dart';
import '../../models/customer_by_seller_model.dart';
... ... @@ -299,64 +301,71 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
if (collectStoreProvider.sellerSimple) {
//极速版
App.sp.remove('sellerEdate');
App.sp.remove('sellerEdateModule');
NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面
if (Constant.normalApp) {
_version();
} else {
if (collectStoreProvider.sellerVersionList != null &&
collectStoreProvider.sellerVersionList.length > 0) {
if (collectStoreProvider.sellerSimple) {
//极速版
App.sp.remove('sellerEdate');
App.sp.remove('sellerEdateModule');
NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面
} else {
_version();
}
}
}
_version() {
if (collectStoreProvider.sellerVersionList != null &&
collectStoreProvider.sellerVersionList.length > 0) {
//获取到店铺过期时间
//店铺过期提醒
// 计算时间差
//店铺过期日期
List<SellerVersionSunModel> showData = [];
// App.sp.remove('sellerEdateModule');
if (App.sp.containsKey('sellerEdateModule')) {
dataSp = json.decode(App.sp.getString('sellerEdateModule'));
}
//店铺过期提醒
// 计算时间差
//店铺过期日期
List<SellerVersionSunModel> showData = [];
// App.sp.remove('sellerEdateModule');
if (App.sp.containsKey('sellerEdateModule')) {
dataSp = json.decode(App.sp.getString('sellerEdateModule'));
}
collectStoreProvider.sellerVersionList.forEach((element) {
_edateSellerModuleShow(showData, element, dataSp);
});
print(showData);
print(dataSp);
if (dataSp.length > 0) {
App.sp.setString("sellerEdateModule", json.encode(dataSp));
// var data = json.decode(App.sp.getString('sellerEdateModule'));
// var str = App.sp.getString('sellerEdateModule');
// print(str);
// print(data);
}
collectStoreProvider.sellerVersionList.forEach((element) {
_edateSellerModuleShow(showData, element, dataSp);
});
print(showData);
print(dataSp);
if (dataSp.length > 0) {
App.sp.setString("sellerEdateModule", json.encode(dataSp));
// var data = json.decode(App.sp.getString('sellerEdateModule'));
// var str = App.sp.getString('sellerEdateModule');
// print(str);
// print(data);
}
if (showData != null && showData.length > 0) {
DialogUtil.showSellerVersionEdateDialog(
context, showData, (object) {});
}
//通过showdata 弹窗
// timerSellerModuleEdate = Timer.periodic(Duration(days: 1), (_) {
// //店铺过期提醒
// // 计算时间差
// //店铺过期日期
// _edateShow();
// });
return true;
} else {
if (_currIndex != 4) {
if (App.sp.containsKey('sellerEdate')) {
List<String> data = App.sp.getStringList('sellerEdate');
if (data.contains('-1')) {
//已经弹过过期弹窗,默认我的
_currIndex = 4;
}
if (showData != null && showData.length > 0) {
DialogUtil.showSellerVersionEdateDialog(context, showData, (object) {});
}
//通过showdata 弹窗
// timerSellerModuleEdate = Timer.periodic(Duration(days: 1), (_) {
// //店铺过期提醒
// // 计算时间差
// //店铺过期日期
// _edateShow();
// });
return true;
} else {
if (_currIndex != 4) {
if (App.sp.containsKey('sellerEdate')) {
List<String> data = App.sp.getStringList('sellerEdate');
if (data.contains('-1')) {
//已经弹过过期弹窗,默认我的
_currIndex = 4;
}
NavigatorUtil.goHomePage(context, initialIndex: _currIndex);
}
return false;
NavigatorUtil.goHomePage(context, initialIndex: _currIndex);
}
return false;
}
}
... ...
... ... @@ -145,10 +145,17 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
// NavigatorUtil.goHomePage(context);
//获取登陆接口返回的vid 如果是14 极速版，则跳转至极速版
// if (user['sellerVersion'] == '14') {
if (Provider.of<UserModel>(context,listen: false).user.sellerVersion == '14') {
NavigatorUtil.goHomePageSim(context);
} else {
if (Constant.normalApp) {
NavigatorUtil.goHomePage(context);
} else {
if (Provider.of<UserModel>(context, listen: false)
.user
.sellerVersion ==
'14') {
NavigatorUtil.goHomePageSim(context);
} else {
NavigatorUtil.goHomePage(context);
}
}
});
} else {
... ...
... ... @@ -29,6 +29,7 @@ import 'package:provider/provider.dart';
import '../../app.dart';
import '../../constant/constant.dart';
import '../../models/get_seller_info_model.dart';
import '../../provider/collect_store_provider.dart';
import '../../provider/customer_provider.dart';
... ... @@ -232,13 +233,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
if (collectStoreProvider.sellerSimple) {
//极速版
App.sp.remove('sellerEdate');
App.sp.remove('sellerEdateModule');
NavigatorUtil.goHomePageSim(context, initialIndex: 3); //跳转到极速版 我的 页面
} else {
if (Constant.normalApp) {
if (collectStoreProvider.sellerNormal) {
if (collectStoreProvider.sellerNormalEdate != null) {
//店铺过期提醒
... ... @@ -268,11 +263,54 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
} else {
outDay = '0';
}
// setState(() {});
setState(() {});
} else {
outDay = '0';
}
setState(() {});
} else {
if (collectStoreProvider.sellerSimple) {
//极速版
App.sp.remove('sellerEdate');
App.sp.remove('sellerEdateModule');
NavigatorUtil.goHomePageSim(context, initialIndex: 3); //跳转到极速版 我的 页面
} else {
if (collectStoreProvider.sellerNormal) {
if (collectStoreProvider.sellerNormalEdate != null) {
//店铺过期提醒
// 计算时间差
//店铺过期日期
edate = DateTime.fromMillisecondsSinceEpoch(
int.parse(collectStoreProvider.sellerNormalEdate) * 1000);
String from = DateUtil.formatDate(DateTime.now(),
format: DateFormats.y_mo_d) +
' 00:00:00';
DateTime datenow = DateUtil.getDateTime(from);
//比较相差的天数
int difference = edate.difference(datenow).inDays;
int differenceSeconds = edate.difference(datenow).inSeconds;
if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
//过期
outDay = '0';
} else {
outDay = difference.toString();
}
// print(outDay);
} else {
outDay = '0';
}
// setState(() {});
} else {
outDay = '0';
}
setState(() {});
}
}
}
... ...
... ... @@ -103,14 +103,8 @@ class CollectStoreProvider with ChangeNotifier {
sellerVersionList.forEach((element) {
versionCodeList.add(element.vid);
});
sellerSimple = versionCodeList.any((element) => element == '14');
if (sellerSimple) {
//极速版
if (App.sp.containsKey("sellerEdate")) {
App.sp.remove("sellerEdate");
}
} else {
if (Constant.normalApp) {
sellerCoupon = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
... ... @@ -170,7 +164,6 @@ class CollectStoreProvider with ChangeNotifier {
sellerNormalEdate = element.edate;
}
});
if (!sellerNormal) {
//超能版或者标准版过期
App.sp.setStringList("sellerEdate", ['-1']);
... ... @@ -179,6 +172,84 @@ class CollectStoreProvider with ChangeNotifier {
App.sp.remove("sellerEdate");
}
}
} else {
sellerSimple = versionCodeList.any((element) => element == '14');
if (sellerSimple) {
//极速版
if (App.sp.containsKey("sellerEdate")) {
App.sp.remove("sellerEdate");
}
} else {
sellerCoupon = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '8');
sellerRecharge = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '9');
sellerWine = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '7');
sellerOrderCustomer = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '6');
sellerOrderManager = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '5');
sellerFeast = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '12');
sellerPreserve = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '10');
sellerMarketing = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '11');
sellerNormal = versionCodeList.any((element) =>
element == '1' ||
element == '2' ||
element == '3' ||
element == '4' ||
element == '13');
sellerVersionList.forEach((element) {
if (element.vid == '1' ||
element.vid == '2' ||
element.vid == '3' ||
element.vid == '4' ||
element.vid == '13') {
sellerNormalEdate = element.edate;
}
});
if (!sellerNormal) {
//超能版或者标准版过期
App.sp.setStringList("sellerEdate", ['-1']);
} else {
if (App.sp.containsKey("sellerEdate")) {
App.sp.remove("sellerEdate");
}
}
}
}
} else {
//超能版或者标准版过期 && 极速版也没有
... ...
... ... @@ -113,7 +113,7 @@ class UserModel with ChangeNotifier {
'token': baseResp.data[0]["token"]['token'],
'nickname': user['nick_name'],
'edate': seller['edate'],
'sellerVersion':sellerVersion
'sellerVersion': sellerVersion
};
await saveUserInfo(User.fromJson(userMap));
... ... @@ -217,11 +217,16 @@ class UserModel with ChangeNotifier {
App.sp.setString("is_call_tel", seller['is_call_tel'].toString());
pullMarketingByUid(context);
//获取登陆接口返回的vid 如果是14 极速版，则跳转至极速版
if (user['sellerVersion'] == '14') {
NavigatorUtil.goHomePageSim(context);
} else {
if (Constant.normalApp) {
NavigatorUtil.goHomePage(context);
} else {
if (user['sellerVersion'] == '14') {
NavigatorUtil.goHomePageSim(context);
} else {
NavigatorUtil.goHomePage(context);
}
}
return null;
}
}
... ...