Merge remote-tracking branch 'origin/dev_3.3_BLE' into dev_3.3_BLE

# Conflicts:
#	lib/pages/medical/my_trackers/ble_device_type_screens/ble_devices_screen.dart

lib/pages/medical/my_trackers/ble_device_type_screens/lepu_device_types/all_in_one_tracker_connect_screen.dart

@@ -0,0 +1,109 @@
+import 'package:diplomaticquarterapp/extensions/string_extensions.dart';
+import 'package:diplomaticquarterapp/pages/medical/my_trackers/ble_models/ble_devices_model.dart';
+import 'package:flutter_blue_plus/flutter_blue_plus.dart';
+import 'package:diplomaticquarterapp/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class AndesAllInOneConnectScreenIos extends StatefulWidget {
+  final BleDeviceModel deviceModel;
+
+  const AndesAllInOneConnectScreenIos({this.deviceModel});
+
+  @override
+  State<AndesAllInOneConnectScreenIos> createState() => _AndesAllInOneConnectScreenState();
+}
+
+class _AndesAllInOneConnectScreenState extends State<AndesAllInOneConnectScreenIos> {
+  MyTrackersViewModel myTrackersVm;
+
+  @override
+  void initState() {
+    myTrackersVm = context.read<MyTrackersViewModel>();
+    myTrackersVm.connectDevice(widget.deviceModel);
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    myTrackersVm.disConnectDevice();
+    super.dispose();
+  }
+
+  Widget buildWeightScaleUI(MyTrackersViewModel myTrackersViewModel) {
+    return Expanded(
+      child: ListView(
+        children: [
+          if (myTrackersViewModel.andesfitWeightScaleData == null && (myTrackersViewModel.isAndesfitDeviceConnected != null && myTrackersViewModel.isAndesfitDeviceConnected)) ...[
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                mHeight(24.0),
+                Column(
+                  children: [
+                    Text("Please Wait", style: TextStyle(fontSize: 20)),
+                  ],
+                ),
+                mHeight(24.0),
+              ],
+            ),
+          ] else if (false) ...[
+            // Add the UI here for All In One Monitor
+          ] else ...[
+            Padding(
+              padding: const EdgeInsets.all(24.0),
+              child: Center(
+                child: Text(
+                  "Some animation with the instruction",
+                  style: TextStyle(fontSize: 9.0),
+                ),
+              ),
+            )
+          ],
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBarTitle: "${widget.deviceModel.name}",
+      showNewAppBar: true,
+      isShowDecPage: false,
+      showNewAppBarTitle: true,
+      backgroundColor: Color(0xffF8F8F8),
+      body: Padding(
+        padding: const EdgeInsets.all(24.0),
+        child: Consumer(
+          builder: (BuildContext context, MyTrackersViewModel myTrackersViewModel, Widget child) {
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                // buildWeightScaleUI(myTrackersViewModel),
+                Row(
+                  children: [
+                    Expanded(
+                      child: DefaultButton(
+                        "Disconnect with ${widget.deviceModel.name}",
+                        () async {
+                          myTrackersVm.disConnectDevice();
+                          Navigator.pop(context);
+                        },
+                        textColor: Colors.white,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}