Commit eb7e7f6b688f5a7b7e9cafd58fd5b9e9d7309791

Authored by weixin_45529955
1 parent 124d0473

增加客人姓氏语音播报

@@ -20,19 +20,19 @@ if (flutterRoot == null) { @@ -20,19 +20,19 @@ if (flutterRoot == null) {
20 20
21 21
22 22
23 -def flutterVersionCode = "702" 23 +def flutterVersionCode = "703"
24 if (flutterVersionCode == null) { 24 if (flutterVersionCode == null) {
25 - flutterVersionCode = '702' 25 + flutterVersionCode = '703'
26 26
27 27
28 28
29 } 29 }
30 30
31 31
32 -def flutterVersionName = "7.0.2" 32 +def flutterVersionName = "7.0.3"
33 33
34 if (flutterVersionName == null) { 34 if (flutterVersionName == null) {
35 - flutterVersionName = '7.0.2' 35 + flutterVersionName = '7.0.3'
36 36
37 } 37 }
38 38
@@ -83,8 +83,8 @@ android { @@ -83,8 +83,8 @@ android {
83 83
84 ndk { 84 ndk {
85 //选择要添加的对应 cpu 类型的 .so 库。 85 //选择要添加的对应 cpu 类型的 .so 库。
86 - abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位,不支持32位  
87 - // abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' 86 + // abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位,不支持32位
  87 + abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
88 } 88 }
89 89
90 lintOptions { 90 lintOptions {
@@ -160,6 +160,11 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -160,6 +160,11 @@ class _BookInfoPageState extends State<BookInfoPage> {
160 smsChangeFieldSunModel8.show = '{客人姓名}'; 160 smsChangeFieldSunModel8.show = '{客人姓名}';
161 changeFieldData.add(smsChangeFieldSunModel8); 161 changeFieldData.add(smsChangeFieldSunModel8);
162 162
  163 + SmsChangeFieldSunModel smsChangeFieldSunModel9 = SmsChangeFieldSunModel();
  164 + smsChangeFieldSunModel9.name = '客人姓氏';
  165 + smsChangeFieldSunModel9.show = '{客人姓氏}';
  166 + changeFieldData.add(smsChangeFieldSunModel9);
  167 +
163 WidgetsBinding.instance.addPostFrameCallback((_) async { 168 WidgetsBinding.instance.addPostFrameCallback((_) async {
164 // _initData(); 169 // _initData();
165 voiceIncoC.text = 170 voiceIncoC.text =
@@ -98,7 +98,7 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -98,7 +98,7 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
98 } 98 }
99 99
100 _getTitleTypeData() async { 100 _getTitleTypeData() async {
101 - await marketingCenterProvider.getTitleTypeData(context,showLoading: false); 101 + await marketingCenterProvider.getTitleTypeData(context, showLoading: false);
102 } 102 }
103 103
104 _getThemeData() async { 104 _getThemeData() async {
@@ -140,12 +140,14 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -140,12 +140,14 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
140 // swiperController.notifyListeners(); 140 // swiperController.notifyListeners();
141 if (marketingCenterProvider.isThemeColor) { 141 if (marketingCenterProvider.isThemeColor) {
142 List<ColorListModel> colors = marketingCenterProvider.colors; 142 List<ColorListModel> colors = marketingCenterProvider.colors;
143 - themeColor = colors[colors.indexWhere((element) =>  
144 - element.liteClass ==  
145 - marketingCenterProvider.markDataModel!.liteClass)]  
146 - .colorName;  
147 - marketingCenterProvider.templeteDatas![index].themeColorDefault =  
148 - themeColor; 143 + if (marketingCenterProvider.markDataModel!.liteClass != '') {
  144 + themeColor = colors[colors.indexWhere((element) =>
  145 + element.liteClass ==
  146 + marketingCenterProvider.markDataModel!.liteClass)]
  147 + .colorName;
  148 + marketingCenterProvider.templeteDatas![index].themeColorDefault =
  149 + themeColor;
  150 + }
149 } 151 }
150 152
151 setState(() {}); 153 setState(() {});
@@ -163,7 +165,8 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -163,7 +165,8 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
163 } 165 }
164 166
165 Future<bool> getSellerTemplateConf(BuildContext context) async { 167 Future<bool> getSellerTemplateConf(BuildContext context) async {
166 - bool success = await marketingCenterProvider.getSellerTemplateConf(context,showLoading: false); 168 + bool success = await marketingCenterProvider.getSellerTemplateConf(context,
  169 + showLoading: false);
167 if (success && marketingCenterProvider.markDataModel != null) { 170 if (success && marketingCenterProvider.markDataModel != null) {
168 return true; 171 return true;
169 } else { 172 } else {
@@ -328,8 +331,8 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -328,8 +331,8 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
328 // SellerTemplateColorListModel.fromJson(data).data; 331 // SellerTemplateColorListModel.fromJson(data).data;
329 // return true; 332 // return true;
330 333
331 - bool success =  
332 - await marketingCenterProvider.getSellerTemplateColorList(context,showLoading: false); 334 + bool success = await marketingCenterProvider
  335 + .getSellerTemplateColorList(context, showLoading: false);
333 if (success) { 336 if (success) {
334 return true; 337 return true;
335 } 338 }
@@ -337,7 +340,8 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -337,7 +340,8 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
337 } 340 }
338 341
339 Future<bool> getColorsData() async { 342 Future<bool> getColorsData() async {
340 - bool success = await marketingCenterProvider.getColorsData(context,showLoading: false); 343 + bool success = await marketingCenterProvider.getColorsData(context,
  344 + showLoading: false);
341 if (success) { 345 if (success) {
342 return true; 346 return true;
343 } 347 }