Commit 97263f153c7942aa09de197893154045279128ed

Authored by wdn127929
1 parent 9c48bb14

地址

... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 522;
CURRENT_PROJECT_VERSION = 5230;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -558,15 +558,12 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 5.2.2;
MARKETING_VERSION = 5.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -699,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 522;
CURRENT_PROJECT_VERSION = 5230;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
... ... @@ -709,15 +706,12 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 5.2.2;
MARKETING_VERSION = 5.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -738,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 522;
CURRENT_PROJECT_VERSION = 5230;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -748,15 +742,12 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 5.2.2;
MARKETING_VERSION = 5.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -63,6 +63,8 @@
<string></string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wxworklocal</string>
<string>wxwork</string>
<string>weixinULAPI</string>
<string>wechat</string>
<string>weixin</string>
... ...
... ... @@ -606,7 +606,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
_user.morning = sellerInfoSunModel.data.dailyShow.morning;
_user.noon = sellerInfoSunModel.data.dailyShow.noon;
_user.night = sellerInfoSunModel.data.dailyShow.night;
_user.sellerAddr = sellerInfoSunModel.data.realAddress;
_user.sellerAddr =
'${sellerInfoSunModel.data.mapAddress}${sellerInfoSunModel.data.realAddress ?? ''}';
await UserModel().saveUserInfo(_user);
}
}
... ...
... ... @@ -175,7 +175,7 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
"sellerimage": seller['seller_image'],
"sellername": seller['sellername'],
"sellerphone": seller['seller_tel'],
"sellerAddr": '',
"sellerAddr": seller['address'],
"scatter": 0,
"room": 0,
"cassette": 0,
... ...
... ... @@ -246,7 +246,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
"sellercode": seller['seller_code'],
"sellername": seller['sellername'],
"sellerphone": seller['seller_tel'],
"sellerAddr": '',
"sellerAddr": seller['address'],
"scatter": 0,
"room": 0,
"cassette": 0,
... ...
... ... @@ -428,7 +428,11 @@ class _FeastDishSharePageState extends State<FeastDishSharePage> {
fontSize: 36,
isBold: false,
onPressed: () {
ShareHelper.onShareWx(
// ShareHelper.onShareWx(
// context,
// boundaryKey: boundaryKey,
// );
ShareHelper.onShareWxwork(
context,
boundaryKey: boundaryKey,
);
... ...
... ... @@ -100,7 +100,7 @@ class UserModel with ChangeNotifier {
"sellercode": params['seller_code'],
"sellername": seller['sellername'],
"sellerphone": seller['seller_tel'],
"sellerAddr": '',
"sellerAddr": seller['address'],
"scatter": 0,
"room": 0,
"cassette": 0,
... ...
... ... @@ -6,6 +6,8 @@
* @Description: 分享工具
*/
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_wxwork/flutter_wxwork.dart';
import 'package:one_key/utils/repaint_boundary_utils.dart';
... ... @@ -45,24 +47,25 @@ class ShareHelper {
//企业微信分享
static Future<bool> onShareWxwork(BuildContext context, {boundaryKey}) async {
FlutterWxwork flutterWxwork = FlutterWxwork();
String ddd = await flutterWxwork.isAppInstalled();
print(ddd);
bool isAppInstalled = await flutterWxwork.isAppInstalled();
print(isAppInstalled);
//收回键盘,如果有输入的情况下,先收回键盘,再截图
FocusScope.of(context).requestFocus(FocusNode());
// if (ddd) {
//分享
// WxSdk.ShareText("sdgsfds",title:"标题");
//获取截图地址
String filePath = await RepaintBoundaryUtils().captureImage(boundaryKey);
if (isAppInstalled) {
//分享
// WxSdk.ShareText("sdgsfds",title:"标题");
//获取截图地址
String filePath = await RepaintBoundaryUtils().captureImage(boundaryKey);
print(filePath);
await flutterWxwork.registerApp("wwauthbdca186ec4257973000006", "wwbdca186ec4257973", "1000006");
await flutterWxwork.shareImagePath(filePath);
// } else {
// //提示未安装微信
// Utils.showToast("未安装企业微信");
// }
print(filePath);
await flutterWxwork.registerApp(
"wwauthbdca186ec4257973000006", "wwbdca186ec4257973", "1000006");
await flutterWxwork.shareImagePath(filePath);
} else {
//提示未安装微信
Utils.showToast("未安装企业微信");
}
}
}
... ...
... ... @@ -2067,7 +2067,7 @@ class Utils {
String _description = "进入查看包间详情,转发同行好友,还可一键导航到饭店";
// Uint8List source = await testComporessList(context, _thumbnail);
bool isSuccess;
bool isSuccess = false;
if (isWechat) {
//跳转小程序
String _userName = "gh_487873d353b3";
... ... @@ -2089,22 +2089,26 @@ class Utils {
isSuccess = await shareToWeChat(model);
} else {
String _path =
"pages/customer/index.html?id=$rid&hasInvitation=1&hasSellerShare=1&uid=$uid";
FlutterWxwork flutterWxwork = FlutterWxwork();
bool registerResult = await flutterWxwork.registerApp(
'wwauthbdca186ec4257973000003', 'wwbdca186ec4257973', '1000003');
print(registerResult);
bool isSuccess = await flutterWxwork.shareMiniProgram(
userName: 'gh_487873d353b3@app',
path: _path,
hdImageData: _thumbnail,
title: _title);
// var isSuccess = await flutterWxwork.shareImage();
print(isSuccess);
bool isAppInstalled = await flutterWxwork.isAppInstalled();
print(isAppInstalled);
if (isAppInstalled) {
bool registerResult = await flutterWxwork.registerApp(
'wwauthbdca186ec4257973000003', 'wwbdca186ec4257973', '1000003');
print(registerResult);
isSuccess = await flutterWxwork.shareMiniProgram(
userName: 'gh_487873d353b3@app',
path: _path,
hdImageData: _thumbnail,
title: _title);
// var isSuccess = await flutterWxwork.shareImage();
print(isSuccess);
} else {
Utils.showToast('未安装企业微信');
}
}
return isSuccess;
... ...
... ... @@ -18,8 +18,8 @@ FlutterMethodChannel *channel;
- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
if([@"isAppInstalled" isEqualToString:call.method]){
NSString *str = [NSString stringWithFormat:@"%hhd",[WWKApi isAppInstalled]];
result(str);
result(@([WWKApi isAppInstalled]));
}else if ([@"register" isEqualToString:call.method]) {
NSDictionary *dic = call.arguments;
NSString *scheme = dic[@"scheme"];
... ... @@ -60,7 +60,7 @@ FlutterMethodChannel *channel;
}
- (void)shareImageNetWork:(FlutterMethodCall *)call result:(FlutterResult)result {
[WWKApi registerApp:@"wwauthbdca186ec4257973000006" corpId:@"wwbdca186ec4257973" agentId:@"1000006"];
// [WWKApi registerApp:@"wwauthbdca186ec4257973000006" corpId:@"wwbdca186ec4257973" agentId:@"1000006"];
dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
dispatch_async(globalQueue, ^{
... ...
import 'dart:io';
import 'package:flutter_wxwork/flutter_wxwork_method_channel.dart';
import 'flutter_wxwork_platform_interface.dart';
... ... @@ -15,7 +17,7 @@ class FlutterWxwork {
return FlutterWxworkPlatform.instance.auth();
}
Future<String> isAppInstalled() {
Future<bool> isAppInstalled() {
return FlutterWxworkPlatform.instance.isAppInstalled();
}
... ...
import 'dart:convert';
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
... ... @@ -30,23 +31,22 @@ class MethodChannelFlutterWxwork extends FlutterWxworkPlatform {
}
@override
Future<String> isAppInstalled() async {
Future<bool> isAppInstalled() async {
final isAppInstalled =
await methodChannel.invokeMethod<String>('isAppInstalled');
await methodChannel.invokeMethod<bool>('isAppInstalled');
return isAppInstalled;
}
@override
Future<bool> shareImageNetWork(String path) async {
final shareImageNetWork =
await methodChannel.invokeMethod<bool>('shareImageNetWork', <String, String>{
final shareImageNetWork = await methodChannel
.invokeMethod<bool>('shareImageNetWork', <String, String>{
'path': path,
});
return shareImageNetWork;
}
@override
@override
Future<bool> shareImagePath(String path) async {
final shareImagePath =
await methodChannel.invokeMethod<bool>('shareImagePath', <String, String>{
... ...
import 'dart:io';
import 'package:plugin_platform_interface/plugin_platform_interface.dart';
import 'flutter_wxwork_method_channel.dart';
... ... @@ -31,7 +33,7 @@ abstract class FlutterWxworkPlatform extends PlatformInterface {
throw UnimplementedError('registerApp() has not been implemented.');
}
Future<String> isAppInstalled() {
Future<bool> isAppInstalled() {
throw UnimplementedError('isAppInstalled() has not been implemented.');
}
... ...