Commit 7c1889ae2f00e66ace5d5d1728a035b8a377cb9a

Authored by wdn127929
1 parent 94771e66

推送静默

... ... @@ -487,7 +487,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 370;
CURRENT_PROJECT_VERSION = 380;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -496,13 +496,13 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.7.2;
MARKETING_VERSION = 3.8.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -632,22 +632,22 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 370;
CURRENT_PROJECT_VERSION = 380;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
FLUTTER_BUILD_MODE = debug;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.7.2;
MARKETING_VERSION = 3.8.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -667,7 +667,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 370;
CURRENT_PROJECT_VERSION = 380;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -676,13 +676,13 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.7.2;
MARKETING_VERSION = 3.8.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -339,7 +339,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
//初始化信鸽推送
initPlatformState() {
/// 开启DEBUG
XgFlutterPlugin().setEnableDebug(false);
XgFlutterPlugin().setEnableDebug(true);
/// 添加回调事件
XgFlutterPlugin().addEventHandler(
... ... @@ -394,6 +394,34 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
},
onReceiveMessage: (Map<String, dynamic> msg) async {
print("flutter onReceiveMessage $msg");
// Utils.showToast(msg.toString());
if (Platform.isIOS) {
Map custom = json.decode(msg['custom'].toString());
print(custom['messagetype']);
if (custom['messagetype'] == '17') {
//账号被迫下线
//静默消息--透传消息
UserModel model = Provider.of<UserModel>(context, listen: false);
model.loginOut(context, {
"seller_code": model.user.sellercode,
"account": model.user.account
});
}
} else {
Map custom = json.decode(msg['content'].toString());
print(custom['messagetype']);
if (custom['messagetype'] == '17') {
//账号被迫下线
//静默消息--透传消息
UserModel model = Provider.of<UserModel>(context, listen: false);
model.loginOut(context, {
"seller_code": model.user.sellercode,
"account": model.user.account
});
}
}
},
xgPushDidSetBadge: (String msg) async {
print("flutter xgPushDidSetBadge: $msg");
... ...
... ... @@ -180,12 +180,19 @@ class _PersonnelDetailPageState extends State<PersonnelDetailPage> {
}
///删除店员
Future<bool> _delSellerClerk({bool showLoading = true}) async {
Map<String, String> params = {'seller_user_id': data.id};
_delSellerClerk(String uid, {bool showLoading = true}) async {
Map<String, String> params = {
'seller_user_id': data.id,
'new_user_id': uid
};
bool success = await personnelProvider.delSellerClerk(context, params,
showLoading: showLoading);
return success;
if (success) {
//删除员工成功
EventBus().emit('personnel_manage_page');
Navigator.pop(context);
}
}
///编辑店员
... ... @@ -216,48 +223,48 @@ class _PersonnelDetailPageState extends State<PersonnelDetailPage> {
}
}
List<Widget> _listWidget(List<String> titleList) {
List<Widget> list = [];
titleList.forEach((element) {
list.add(
RoundButton(
text: element,
fontSize: 30,
isBold: false,
height: ScreenUtil().setWidth(80),
// width: double.infinity,
width: (ScreenUtil.screenWidthDp - ScreenUtil().setWidth(140)) / 2,
radius: ScreenUtil().setWidth(10),
onPressed: () {
if (element == '设为接单人') {
DialogUtil.cupertinoAlertDialog(context,
content: '请确认该用户关注了周到安排公众号并填写了手机号,否则无法接单', rCallback: () {
_setUserIsCall();
});
} else if (element == '移除店员') {
DialogUtil.cupertinoAlertDialog(context,
title: '提示',
content: '移除店员后,店员将无法接收门店收款通知,店员收款码也将无法收款',
rTitle: '移除', rCallback: () {
_delSellerClerk();
});
} else if (element == '绑定微信') {
if (dcAdduserCode != '' && dcAdduserCode != null) {
DialogUtil.openAlertDialogImage(
context, '请员工使用微信扫一扫添加店员', dcAdduserCode, 660);
} else {
_getWechatQrcode(need: true);
}
} else if (element == '查看密码') {
NavigatorUtil.goPersonnelPasswordPage(context,
account: data.account, idstr: data.id);
}
},
),
);
});
return list;
}
// List<Widget> _listWidget(List<String> titleList) {
// List<Widget> list = [];
// titleList.forEach((element) {
// list.add(
// RoundButton(
// text: element,
// fontSize: 30,
// isBold: false,
// height: ScreenUtil().setWidth(80),
// // width: double.infinity,
// width: (ScreenUtil.screenWidthDp - ScreenUtil().setWidth(140)) / 2,
// radius: ScreenUtil().setWidth(10),
// onPressed: () {
// if (element == '设为接单人') {
// DialogUtil.cupertinoAlertDialog(context,
// content: '请确认该用户关注了周到安排公众号并填写了手机号,否则无法接单', rCallback: () {
// _setUserIsCall();
// });
// } else if (element == '移除店员') {
// DialogUtil.cupertinoAlertDialog(context,
// title: '提示',
// content: '移除店员后,店员将无法接收门店收款通知,店员收款码也将无法收款',
// rTitle: '移除', rCallback: () {
// _delSellerClerk();
// });
// } else if (element == '绑定微信') {
// if (dcAdduserCode != '' && dcAdduserCode != null) {
// DialogUtil.openAlertDialogImage(
// context, '请员工使用微信扫一扫添加店员', dcAdduserCode, 660);
// } else {
// _getWechatQrcode(need: true);
// }
// } else if (element == '查看密码') {
// NavigatorUtil.goPersonnelPasswordPage(context,
// account: data.account, idstr: data.id);
// }
// },
// ),
// );
// });
// return list;
// }
///获取二维码
_getWechatQrcode({bool need = false}) async {
... ... @@ -626,23 +633,7 @@ class _PersonnelDetailPageState extends State<PersonnelDetailPage> {
} else {
//选择了某个经理
}
Future.wait<bool>([
// 2秒后返回结果
Future.delayed(new Duration(seconds: 2), () {
return true;
}),
// 4秒后返回结果
_delSellerClerk()
]).then((results) {
print(results[0]);
if (results[1]) {
//删除员工成功
EventBus().emit('personnel_manage_page');
Navigator.pop(context);
}
}).catchError((e) {
print(e);
});
_delSellerClerk(uid);
// DialogUtil.cupertinoAlertDialog(context,
// title: '提示',
... ...