配对、连接、以及对应loading添加完成

android/app/src/main/java/io/flutter/plugins/BluetoothPlugin.java

@@ -62,12 +62,11 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
 
     OnDiscoveryDeviceStreamHandler onDiscoveryDeviceStreamHandler;
     private EventChannel onReceiveDeviceChannel;
-    public EventChannel.EventSink onReceiveSink;
 
-    private BlueDeviceInfo itemPosition;
-
-//    private MainActivity _mainActivity;
+    OnDeviceStateStreamHandler onDeviceStateStreamHandler;
+    private EventChannel onDeviceStateChannel;
 
+    private BlueDeviceInfo itemPosition;
 
     Context _applicationContext;
     private BluetoothAdapter mBluetoothAdapter;
@@ -104,8 +103,6 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
         setupChannels(flutterPluginBinding.getBinaryMessenger(), flutterPluginBinding.getApplicationContext());
-
-
     }
 
     private void setupChannels(BinaryMessenger binaryMessenger, Context applicationContext) {
@@ -118,6 +115,10 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
         onReceiveDeviceChannel = new EventChannel(binaryMessenger, methodChannelName + "/onDiscoveryDevice");
         onDiscoveryDeviceStreamHandler = new OnDiscoveryDeviceStreamHandler();
         onReceiveDeviceChannel.setStreamHandler(onDiscoveryDeviceStreamHandler);
+
+        onDeviceStateChannel = new EventChannel(binaryMessenger, methodChannelName + "/onDeviceState");
+        onDeviceStateStreamHandler = new OnDeviceStateStreamHandler();
+        onDeviceStateChannel.setStreamHandler(onDeviceStateStreamHandler);
     }
 
     @Override
@@ -149,6 +150,11 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
                 Log.d("ble", "startBluetoothConnect :"+methodCall.arguments);
                 startBluetoothConnect(methodCall, result);
                 break;
+            case "endBluetoothConnect":
+                Log.d("ble", "endBluetoothConnect :"+methodCall.arguments);
+                endBluetoothConnect(methodCall, result);
+                break;
+
 
 
             case "autoLogin":
@@ -220,18 +226,17 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
         if (mBluetoothAdapter.isDiscovering()) {
             mBluetoothAdapter.cancelDiscovery();
         }
-        Log.d("ble", "startBluetoothPair");
-        String deviceMac = methodCall.arguments.toString();
-        String[] deviceInfoList = deviceMac.split(delimiterStr);
+
+        String deviceInfo = methodCall.arguments.toString();
+        String[] deviceInfoList = deviceInfo.split(delimiterStr);
+        for(int i =0; i < deviceInfoList.length ; i++) {
+            Log.d("ble", i+":"+deviceInfoList[i]);
+        }
+        Log.d("ble", "startBluetoothPair : ---"+deviceInfo + "----0:"+deviceInfoList[0]);
         itemPosition = new BlueDeviceInfo(deviceInfoList[0], deviceInfoList[1], Integer.parseInt(deviceInfoList[2]));
         BluetoothDevice bluetoothDevice = mBluetoothAdapter.getRemoteDevice(itemPosition.getDeviceHardwareAddress());
 
         executorService.submit(() -> {
-//            requireActivity().runOnUiThread(() -> {
-//                bind.spinKit.setVisibility(View.GONE);
-//                fragment = new MyDialogLoadingFragment("配对中");
-//                fragment.show(requireActivity().getSupportFragmentManager(), "pairing");
-//            });
             Log.d("ble", "配对: 开始");
             boolean returnValue = false;
             try {
@@ -262,26 +267,21 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
         BluetoothDevice bluetoothDevice = mBluetoothAdapter.getRemoteDevice(itemPosition.getDeviceHardwareAddress());
 
         executorService.submit(() -> {
-//            requireActivity().runOnUiThread(() -> {
-//                bind.spinKit.setVisibility(View.GONE);
-//                fragment = new MyDialogLoadingFragment("连接中");
-//                fragment.show(requireActivity().getSupportFragmentManager(), "CONNECT");
-//            });
-
             BlueDeviceInfo blueDeviceInfo = new BlueDeviceInfo(bluetoothDevice.getName(), bluetoothDevice.getAddress(), itemPosition.getConnectState());
             PrintUtil.setConnectedType(-1);
             int connectResult = PrintUtil.connectBluetoothPrinter(blueDeviceInfo.getDeviceHardwareAddress());
             Log.d("ble", "测试：连接结果 " + connectResult);
             result.success(connectResult);
-
         });
     }
 
-
+    void endBluetoothConnect(@NonNull MethodCall methodCall, @NonNull MethodChannel.Result result) {
+        PrintUtil.close();
+        result.success(0);
+    }
 
     private final BroadcastReceiver receiver = new BroadcastReceiver() {
 
-
         @SuppressLint("MissingPermission")
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -314,20 +314,25 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
                     if (supportBluetoothType && supportPrintName) {
 
                         Log.d("ble", "测试:打印机名称- " + deviceName + "，设备地址:" + deviceHardwareAddress + "，设备类型:" + device.getType() + ", 设备状态："+deviceStatus);
-                        Log.d("ble", "sink:" + onReceiveSink + ":" + "onDiscoveryDeviceStreamHandler" +  (onDiscoveryDeviceStreamHandler != null) + "onDiscoveryDeviceStreamHandler.sink != null:" + (onDiscoveryDeviceStreamHandler.sink));
+                        Log.d("ble",  ":" + "onDiscoveryDeviceStreamHandler" +  (onDiscoveryDeviceStreamHandler != null) + "onDiscoveryDeviceStreamHandler.sink != null:" + (onDiscoveryDeviceStreamHandler.sink));
                         if (onDiscoveryDeviceStreamHandler != null && onDiscoveryDeviceStreamHandler.sink != null) {
                             onDiscoveryDeviceStreamHandler.sink.success(deviceName+delimiterStr+deviceHardwareAddress+delimiterStr+deviceStatus);
                         }
                     }
-
                 }
-
             } else if (BluetoothAdapter.ACTION_DISCOVERY_STARTED.equals(action)) {
                 Log.v("ble", "测试:开始搜索");
-//                bind.spinKit.setVisibility(View.VISIBLE);
+                Log.d("ble",  ":" + "onDeviceStateStreamHandler" +  (onDeviceStateStreamHandler != null) + "onDeviceStateStreamHandler.sink != null:" + (onDeviceStateStreamHandler.sink));
+                if (onDeviceStateStreamHandler != null && onDeviceStateStreamHandler.sink != null) {
+                    onDeviceStateStreamHandler.sink.success("scanStart");
+                }
             } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
                 Log.v("ble", "测试:搜索结束");
 //                bind.spinKit.setVisibility(View.GONE);
+                Log.d("ble",  ":" + "onDeviceStateStreamHandler" +  (onDeviceStateStreamHandler != null) + "onDeviceStateStreamHandler.sink != null:" + (onDeviceStateStreamHandler.sink));
+                if (onDeviceStateStreamHandler != null && onDeviceStateStreamHandler.sink != null) {
+                    onDeviceStateStreamHandler.sink.success("scanEnd");
+                }
             } else if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(action)) {
                 int state = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, -1);
                 Log.d("ble", "测试:配对状态改变:0 " + state);
@@ -338,9 +343,10 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
                     }
                 }
             } else if (BluetoothDevice.ACTION_PAIRING_REQUEST.equals(action)) {
-//                if (fragment != null) {
-//                    fragment.dismiss();
-//                }
+
+                if (onDeviceStateStreamHandler != null && onDeviceStateStreamHandler.sink != null) {
+                    onDeviceStateStreamHandler.sink.success("pairEnd");
+                }
             }
         }
     };
@@ -365,4 +371,22 @@ class OnDiscoveryDeviceStreamHandler implements EventChannel.StreamHandler {
         Log.e("zhousuhua","OnReceiveDataStreamHandler=== onCancel");
         sink = null;
     }
+}
+
+class OnDeviceStateStreamHandler implements EventChannel.StreamHandler {
+
+    public EventChannel.EventSink sink;
+
+    @Override
+    public void onListen(Object o, EventChannel.EventSink eventSink) {
+
+        Log.d("ble", "OnDeviceStateStreamHandler: onListen");
+        sink = eventSink;
+    }
+    @Override
+    public void onCancel(Object o) {
+
+        Log.e("zhousuhua","OnReceiveDataStreamHandler=== onCancel");
+        sink = null;
+    }
 }

lib/page/home/home_page.dart

@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/page/sample_task/sample_task_list_tab_page.dart';
 
+import '../print/print_page.dart';
+
 /// 首页
 class HomePage extends StatefulWidget {
   const HomePage({Key? key}) : super(key: key);
@@ -21,7 +23,9 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
   late List<ServiceModel> serviceList;
 
   void startSampleList(StepType type) async {
-    MyRouter.startSampleTaskList(SampleTaskListTabPageArgs(type: type));
+    var args = PrintPageArgs(count: 0);
+    await MyRouter.startPrint(args: args);
+    // MyRouter.startSampleTaskList(SampleTaskListTabPageArgs(type: type));
   }
 
   @override

lib/page/print/connect_print_page.dart

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/main.dart';
 import 'package:lszlgl/service/print_service.dart';
+import 'package:lszlgl/widget/loading_widget.dart';
+import 'package:lszlgl/widget/page_widget.dart';
 import 'package:signature/signature.dart';
 import 'package:lszlgl/widget/button.dart';
 
@@ -33,18 +36,16 @@ class ConnectPrintPage extends StatefulWidget {
 }
 
 class _ConnectPrintPageState extends BaseLifecycleState<ConnectPrintPage> {
-  late int count;
-  late List<SignatureController> ctrlList;
-  late PageController pageCtrl;
-
-  final previousEnable = false.notifier<bool>();
-  final nextEnable = false.notifier<bool>();
-  final submitEnable = false.notifier<bool>();
 
   late List<ServiceModel> serviceList;
   late List<BlueDeviceInfo> deviceList;
   late List<String> deviceMacList;
 
+  late List<BlueDeviceInfo> connectedDeviceList;
+  late List<String> connectedDeviceMacList;
+
+  String scanDeviceState = '';
+
   @override
   void initState() {
     super.initState();
@@ -53,9 +54,11 @@ class _ConnectPrintPageState extends BaseLifecycleState<ConnectPrintPage> {
     ];
     deviceList = [];
     deviceMacList = [];
+    connectedDeviceList = [];
+    connectedDeviceMacList = [];
   }
 
-  /// 去连接
+  /// 去搜索
   Future<void> startScan() async {
 
     setState(() {
@@ -65,36 +68,53 @@ class _ConnectPrintPageState extends BaseLifecycleState<ConnectPrintPage> {
     await PrintService.startBluetoothDiscovery();
   }
 
-  /// 去打印
+  /// 去连接
   Future<void> startConnect(BlueDeviceInfo deviceInfo) async {
     if(deviceInfo.connectStateStr == '未配对') {
+      MyNavigator.showLoading(msg: '配对中...');
       await PrintService.startBluetoothPair(deviceInfo);
     } else if(deviceInfo.connectStateStr == '已配对') {
-      await PrintService.startBluetoothConnect(deviceInfo);
+      MyNavigator.showLoading(msg: '连接中...');
+      int connectResult =  await PrintService.startBluetoothConnect(deviceInfo);
+      if(connectResult == 0) { // 连接成功
+        MyNavigator.dismiss();
+        MyNavigator.showToast('连接成功');
+        deviceInfo.connectSuccess();
+        if(deviceMacList.contains(deviceInfo.deviceMac)) {
+          setState(() {
+            deviceMacList.removeWhere((element) => element == deviceInfo.deviceMac);
+            deviceList.removeWhere((element) => element.deviceMac == deviceInfo.deviceMac);
+          });
+        }
+        setState(() {
+          connectedDeviceMacList.add(deviceInfo.deviceMac);
+          connectedDeviceList.add(deviceInfo);
+        });
+      } else {
+        MyNavigator.dismiss();
+        MyNavigator.showToast('连接失败');
+      }
+    } else if(deviceInfo.connectStateStr == '断开') {
+      int connectResult =  await PrintService.endBluetoothConnect(deviceInfo);
+      if(connectResult == 0) {  // 断开成功
+        deviceInfo.disConnectSuccess();
+        if(connectedDeviceMacList.contains(deviceInfo.deviceMac)) {
+          setState(() {
+            connectedDeviceMacList.removeWhere((element) => element == deviceInfo.deviceMac);
+            connectedDeviceList.removeWhere((element) => element.deviceMac == deviceInfo.deviceMac);
+          });
+        }
+        setState(() {
+          deviceMacList.add(deviceInfo.deviceMac);
+          deviceList.add(deviceInfo);
+        });
+      }
     }
   }
 
   @override
   void onInit() {
 
-    // 创建签名列表
-    count = widget.args.count;
-    ctrlList = List.generate(
-      count,
-          (index) => SignatureController(
-        penStrokeWidth: 6,
-        penColor: Colors.black,
-        strokeJoin: StrokeJoin.round,
-        strokeCap: StrokeCap.round,
-      ),
-    ).toList();
-    pageCtrl = PageController();
-    if (count == 1) {
-      submitEnable.value = true;
-    } else {
-      nextEnable.value = true;
-    }
-
     BluetoothPlugin.instance.onReceiveDataStream.listen((deviceInfo) {
       if(deviceInfo != null) {
         if(deviceMacList.contains(deviceInfo.deviceMac)) {
@@ -110,17 +130,19 @@ class _ConnectPrintPageState extends BaseLifecycleState<ConnectPrintPage> {
       }
     });
 
+    BluetoothPlugin.instance.onDeviceStateStream.listen((deviceState) {
+      if(deviceState == DeviceState.pairEnd) {
+        MyNavigator.dismiss();
+      }
+      setState(() {
+        scanDeviceState = deviceState ?? "";
+      });
+    });
   }
 
   @override
   void onDestroy() {
-    SystemChrome.setPreferredOrientations([
-      DeviceOrientation.portraitUp,
-      DeviceOrientation.portraitDown,
-    ]);
-    for (var ctrl in ctrlList) {
-      ctrl.dispose();
-    }
+
   }
 
   @override
@@ -134,7 +156,12 @@ class _ConnectPrintPageState extends BaseLifecycleState<ConnectPrintPage> {
             serviceList.length,
                 (index) => buildServiceItem(serviceList[index]),
           ).toList(),
-
+          const Text('已连接打印机'),
+          ...List.generate(
+            connectedDeviceList.length,
+                (index) => buildDeviceItem(connectedDeviceList[index]),
+          ).toList(),
+          const Text('可用打印机'),
           ...List.generate(
             deviceList.length,
                 (index) => buildDeviceItem(deviceList[index]),
@@ -165,20 +192,10 @@ class _ConnectPrintPageState extends BaseLifecycleState<ConnectPrintPage> {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                    service.name,
+                    "${service.name}${scanDeviceState == DeviceState.scanStart ? "中..." : ""}",
                     textAlign: TextAlign.center,
                     style: const TextStyle(color: Color(0xFF333333), fontSize: 20, fontWeight: FontWeight.w500),
                   ),
-                  service.nameEn != null
-                      ? Padding(
-                    padding: const EdgeInsets.only(top: 4),
-                    child: Text(
-                      service.nameEn!,
-                      textAlign: TextAlign.center,
-                      style: const TextStyle(color: Color(0xFF333333), fontSize: 12, fontWeight: FontWeight.w500),
-                    ),
-                  )
-                      : const SizedBox.shrink(),
                 ],
               ),
             ),

lib/plugin/bluetooth_plugin.dart

@@ -15,6 +15,7 @@ class BluetoothPlugin {
    final String delimiterStr = "_NIMBOT_";
   final MethodChannel _channel = const MethodChannel("io.flutter.plugins/bluetooth/methods");
   final EventChannel _onReceiveDataStream = const EventChannel('io.flutter.plugins/bluetooth/onDiscoveryDevice');
+  final EventChannel _onDeviceStateStream = const EventChannel('io.flutter.plugins/bluetooth/onDeviceState');
 
 
   //是否打开蓝牙
@@ -46,7 +47,8 @@ class BluetoothPlugin {
     if (Platform.isIOS) {
       return 0;
     }
-    return _channel.invokeMethod('startBluetoothPair').then<int>((d) => d);
+    String deviceInfoStr = deviceInfo.deviceName+delimiterStr+deviceInfo.deviceMac+delimiterStr+deviceInfo.connectState;
+    return _channel.invokeMethod('startBluetoothPair', deviceInfoStr).then<int>((d) => d);
   }
 
   //开始连接
@@ -59,7 +61,18 @@ class BluetoothPlugin {
     return _channel.invokeMethod('startBluetoothConnect', deviceInfoStr).then<int>((d) => d);
   }
 
-  //开始连接
+  //断开连接
+  Future<int> endBluetoothConnect(BlueDeviceInfo deviceInfo) async {
+
+    if (Platform.isIOS) {
+      return 0;
+    }
+    String deviceInfoStr = deviceInfo.deviceName+delimiterStr+deviceInfo.deviceMac+delimiterStr+deviceInfo.connectState;
+    return _channel.invokeMethod('endBluetoothConnect', deviceInfoStr).then<int>((d) => d);
+  }
+
+
+  //开始打印
   Future<int> startBluetoothPrint(BlueDeviceInfo deviceInfo) async {
 
     if (Platform.isIOS) {
@@ -72,6 +85,8 @@ class BluetoothPlugin {
 
 
 
+
+
   /// 接收数据监听
   Stream<BlueDeviceInfo?> get onReceiveDataStream async* {
 
@@ -90,10 +105,28 @@ class BluetoothPlugin {
     });
   }
 
+  /// 接收数据监听
+  Stream<String?> get onDeviceStateStream async* {
+
+    yield* _onDeviceStateStream
+        .receiveBroadcastStream()
+        .map((buffer) {
 
+      return buffer.toString();
+    });
+  }
 }
 
 
+class DeviceState {
+
+  static String scanStart = "scanStart";
+
+  static String scanEnd = "scanEnd";
+
+  static String pairEnd = "pairEnd";
+}
+
 class BlueDeviceInfo {
 
   String deviceName;
@@ -104,13 +137,8 @@ class BlueDeviceInfo {
 
   BlueDeviceInfo({required this.deviceName, required this.deviceMac, required this.connectState});
 
-
   String get connectStateStr {
 
-    if(_connectStateStr != null) {
-     return _connectStateStr!;
-    }
-
     if(connectState == '10') {
       _connectStateStr = "未配对";
     }
@@ -120,9 +148,20 @@ class BlueDeviceInfo {
     if(connectState == '12') {
       _connectStateStr = "已配对";
     }
+    if(connectState == '13') {
+      _connectStateStr = "断开";
+    }
     return _connectStateStr ?? "未知";
   }
 
+  void connectSuccess() {
+    connectState = '13';
+  }
+
+  void disConnectSuccess() {
+    connectState = '12';
+  }
+
   @override
   String toString() {
     return {'deviceName:': deviceName, "mac:": deviceMac, "state:": connectState}.toString();

lib/service/print_service.dart

@@ -91,6 +91,16 @@ class PrintService {
     }
   }
 
+  //断开连接
+  static Future<int> endBluetoothConnect(BlueDeviceInfo deviceInfo) async {
+
+    if(await canExecAction()) {
+      return await BluetoothPlugin.instance.endBluetoothConnect(deviceInfo);
+    } else {
+      return 0;
+    }
+  }
+
   //开始打印
   static Future<int> startBluetoothPrint(BlueDeviceInfo deviceInfo) async {