cancel auto connect device v1.3.3

iFreshDemo_1.0/iFreshDemo.xcodeproj/project.pbxproj

@@ -13,7 +13,9 @@
 		1F4E2E411DA8C7F800253C00 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1F4E2E3F1DA8C7F800253C00 /* Main.storyboard */; };
 		1F4E2E431DA8C7F800253C00 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1F4E2E421DA8C7F800253C00 /* Assets.xcassets */; };
 		1F4E2E461DA8C7F800253C00 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1F4E2E441DA8C7F800253C00 /* LaunchScreen.storyboard */; };
-		E633F4E5255BD65800EE5A95 /* iFreshSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E633F4E4255BD65800EE5A95 /* iFreshSDK.framework */; };
+		95658061268478F300F3F333 /* iFreshSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95658060268478F300F3F333 /* iFreshSDK.framework */; };
+		956580662684798700F3F333 /* SearchDeviceVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 956580622684798700F3F333 /* SearchDeviceVC.m */; };
+		956580672684798700F3F333 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 956580652684798700F3F333 /* HomeViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,7 +29,11 @@
 		1F4E2E421DA8C7F800253C00 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		1F4E2E451DA8C7F800253C00 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		1F4E2E471DA8C7F800253C00 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E633F4E4255BD65800EE5A95 /* iFreshSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = iFreshSDK.framework; sourceTree = "<group>"; };
+		95658060268478F300F3F333 /* iFreshSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = iFreshSDK.framework; sourceTree = "<group>"; };
+		956580622684798700F3F333 /* SearchDeviceVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchDeviceVC.m; sourceTree = "<group>"; };
+		956580632684798700F3F333 /* SearchDeviceVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchDeviceVC.h; sourceTree = "<group>"; };
+		956580642684798700F3F333 /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
+		956580652684798700F3F333 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -35,7 +41,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E633F4E5255BD65800EE5A95 /* iFreshSDK.framework in Frameworks */,
+				95658061268478F300F3F333 /* iFreshSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -61,7 +67,11 @@
 		1F4E2E351DA8C7F800253C00 /* iFreshDemo */ = {
 			isa = PBXGroup;
 			children = (
-				E633F4E4255BD65800EE5A95 /* iFreshSDK.framework */,
+				95658060268478F300F3F333 /* iFreshSDK.framework */,
+				956580642684798700F3F333 /* HomeViewController.h */,
+				956580652684798700F3F333 /* HomeViewController.m */,
+				956580632684798700F3F333 /* SearchDeviceVC.h */,
+				956580622684798700F3F333 /* SearchDeviceVC.m */,
 				1F4E2E391DA8C7F800253C00 /* AppDelegate.h */,
 				1F4E2E3A1DA8C7F800253C00 /* AppDelegate.m */,
 				1F4E2E3C1DA8C7F800253C00 /* ViewController.h */,
@@ -157,6 +167,8 @@
 			files = (
 				1F4E2E3E1DA8C7F800253C00 /* ViewController.m in Sources */,
 				1F4E2E3B1DA8C7F800253C00 /* AppDelegate.m in Sources */,
+				956580662684798700F3F333 /* SearchDeviceVC.m in Sources */,
+				956580672684798700F3F333 /* HomeViewController.m in Sources */,
 				1F4E2E381DA8C7F800253C00 /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

iFreshDemo_1.0/iFreshDemo/Base.lproj/Main.storyboard

@@ -1,14 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Gx6-bv-CNq">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
+        <!--Home View Controller-->
+        <scene sceneID="7hm-Mj-uOj">
+            <objects>
+                <viewController id="Gx6-bv-CNq" customClass="HomeViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="12C-PF-bGw"/>
+                        <viewControllerLayoutGuide type="bottom" id="Z5P-QG-Cwk"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="NVh-8s-miL">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dot-s5-Jub">
+                                <rect key="frame" x="0.0" y="40" width="375" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="Lsm-ja-0yw"/>
+                                </constraints>
+                                <state key="normal" title="Click to Scan"/>
+                                <connections>
+                                    <action selector="topButtonClick:" destination="Gx6-bv-CNq" eventType="touchUpInside" id="tf8-vg-yfY"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Weight" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OqD-hk-87d">
+                                <rect key="frame" x="160.5" y="110" width="54" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uJp-jZ-zgm">
+                                <rect key="frame" x="145" y="318.5" width="85" height="30"/>
+                                <state key="normal" title="Change Unit"/>
+                                <connections>
+                                    <action selector="changeUnitAction:" destination="Gx6-bv-CNq" eventType="touchUpInside" id="8Vo-jx-ADF"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="Dot-s5-Jub" secondAttribute="trailing" id="5eF-hV-2DG"/>
+                            <constraint firstItem="Dot-s5-Jub" firstAttribute="leading" secondItem="NVh-8s-miL" secondAttribute="leading" id="AKq-R7-f79"/>
+                            <constraint firstItem="OqD-hk-87d" firstAttribute="top" secondItem="Dot-s5-Jub" secondAttribute="bottom" constant="30" id="FHe-2W-sdU"/>
+                            <constraint firstItem="uJp-jZ-zgm" firstAttribute="centerX" secondItem="NVh-8s-miL" secondAttribute="centerX" id="a1z-ae-3de"/>
+                            <constraint firstItem="uJp-jZ-zgm" firstAttribute="centerY" secondItem="NVh-8s-miL" secondAttribute="centerY" id="cd7-Bk-uam"/>
+                            <constraint firstItem="Dot-s5-Jub" firstAttribute="top" secondItem="12C-PF-bGw" secondAttribute="bottom" constant="40" id="gai-qi-RsD"/>
+                            <constraint firstItem="OqD-hk-87d" firstAttribute="centerX" secondItem="NVh-8s-miL" secondAttribute="centerX" id="tWt-4X-eYx"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="Apu-nt-Ffg"/>
+                    <connections>
+                        <outlet property="topButton" destination="Dot-s5-Jub" id="x4f-ZC-cps"/>
+                        <outlet property="weightLabel" destination="OqD-hk-87d" id="Bbt-w9-cgx"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="5Zi-40-2De" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-330" y="35"/>
+        </scene>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
@@ -21,8 +77,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unit" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fmz-Up-oVz">
-                                <rect key="frame" x="157.5" y="40" width="60" height="35"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单位" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fmz-Up-oVz">
+                                <rect key="frame" x="157.5" y="20" width="60" height="35"/>
                                 <color key="backgroundColor" red="0.16862745100000001" green="0.5568627451" blue="0.75294117650000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="7Rz-lB-cl4"/>
@@ -31,7 +87,7 @@
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lta-jT-th5">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lta-jT-th5">
                                 <rect key="frame" x="299" y="40" width="57" height="35"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.16862745100000001" green="0.5568627451" blue="0.75294117650000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -43,8 +99,8 @@
                                     <action selector="zeroClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="5zL-qr-dOS"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B7N-F7-BA1">
-                                <rect key="frame" x="20" y="40" width="129.5" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B7N-F7-BA1">
+                                <rect key="frame" x="20" y="20" width="129.5" height="35"/>
                                 <color key="backgroundColor" red="0.16862745100000001" green="0.5568627451" blue="0.75294117650000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="35" id="rU5-23-9sE"/>
@@ -57,8 +113,8 @@
                                     <action selector="breakConnect:" destination="BYZ-38-t0r" eventType="touchUpInside" id="39x-By-0PS"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not Connected" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UZz-VA-4Ie">
-                                <rect key="frame" x="224.5" y="40" width="71" height="35"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未连接" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UZz-VA-4Ie">
+                                <rect key="frame" x="224.5" y="20" width="71" height="35"/>
                                 <color key="backgroundColor" red="0.16862745100000001" green="0.5568627451" blue="0.75294117650000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <accessibilityTraits key="traits" staticText="YES" adjustable="YES"/>
@@ -68,21 +124,21 @@
                                     <constraint firstAttribute="width" constant="71" id="igt-ey-5lV"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Weight" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hnA-sg-00L">
-                                <rect key="frame" x="19.5" y="87" width="336" height="93"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="重量" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hnA-sg-00L">
+                                <rect key="frame" x="19.5" y="67" width="336" height="93"/>
                                 <color key="backgroundColor" red="0.16862745100000001" green="0.5568627451" blue="0.75294117650000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="336" id="ch8-HK-xxE"/>
                                     <constraint firstAttribute="height" constant="93" id="gde-Pm-oI2"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K9U-Cb-Dss">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K9U-Cb-Dss">
                                 <rect key="frame" x="244" y="188" width="112" height="35"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.16862745100000001" green="0.5568627451" blue="0.75294117650000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -94,7 +150,7 @@
                                     <action selector="linkBle:" destination="BYZ-38-t0r" eventType="touchUpInside" id="d12-LP-reJ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QN0-5x-oiW">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QN0-5x-oiW">
                                 <rect key="frame" x="198" y="316" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -104,7 +160,7 @@
                                     <action selector="setTotalKcal:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Egm-sA-ekB"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dYC-aI-DOb">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dYC-aI-DOb">
                                 <rect key="frame" x="19" y="316" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -114,7 +170,7 @@
                                     <action selector="setweight:" destination="BYZ-38-t0r" eventType="touchUpInside" id="EnA-89-Ksr"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tjj-JY-AcA">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tjj-JY-AcA">
                                 <rect key="frame" x="281" y="316" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -124,7 +180,7 @@
                                     <action selector="setTotalFat:" destination="BYZ-38-t0r" eventType="touchUpInside" id="W1i-RB-pCP"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aHd-SV-ClN">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aHd-SV-ClN">
                                 <rect key="frame" x="197" y="358" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -134,7 +190,7 @@
                                     <action selector="setTotalFiber:" destination="BYZ-38-t0r" eventType="touchUpInside" id="3BP-b7-CBe"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bB7-ch-hEd">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bB7-ch-hEd">
                                 <rect key="frame" x="184" y="316" width="6" height="160"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -142,7 +198,7 @@
                                     <action selector="setweight:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Sxa-0n-d5J"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jNP-VH-9Hs">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jNP-VH-9Hs">
                                 <rect key="frame" x="102" y="358" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -152,7 +208,7 @@
                                     <action selector="setTotalCarbohydrates:" destination="BYZ-38-t0r" eventType="touchUpInside" id="DHh-1Q-DRV"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zhs-16-laT">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zhs-16-laT">
                                 <rect key="frame" x="18" y="358" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -162,7 +218,7 @@
                                     <action selector="setTotalProtein:" destination="BYZ-38-t0r" eventType="touchUpInside" id="pSY-OV-hWL"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yav-W6-U1P">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yav-W6-U1P">
                                 <rect key="frame" x="280" y="358" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -172,7 +228,7 @@
                                     <action selector="setTotalCholesterol:" destination="BYZ-38-t0r" eventType="touchUpInside" id="F61-ss-WUg"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="62R-0M-lRo">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="62R-0M-lRo">
                                 <rect key="frame" x="197" y="400" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -182,7 +238,7 @@
                                     <action selector="setFat:" destination="BYZ-38-t0r" eventType="touchUpInside" id="nrd-fc-7Sx"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pfA-SF-uWV">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pfA-SF-uWV">
                                 <rect key="frame" x="101" y="400" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -192,7 +248,7 @@
                                     <action selector="setTotalSuger:" destination="BYZ-38-t0r" eventType="touchUpInside" id="1ou-ar-TDc"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Adl-yc-RgY">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Adl-yc-RgY">
                                 <rect key="frame" x="18" y="400" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -202,7 +258,7 @@
                                     <action selector="setTotalSodium:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Ofn-kU-I0p"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BuN-Kd-HBC">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BuN-Kd-HBC">
                                 <rect key="frame" x="280" y="400" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -212,7 +268,7 @@
                                     <action selector="setProtein:" destination="BYZ-38-t0r" eventType="touchUpInside" id="hTn-Ue-LoY"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GDF-5S-qGW">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GDF-5S-qGW">
                                 <rect key="frame" x="198" y="442" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -222,7 +278,7 @@
                                     <action selector="setSodium:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Qle-4d-ETI"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RDh-a4-8UP">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RDh-a4-8UP">
                                 <rect key="frame" x="102" y="442" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -232,7 +288,7 @@
                                     <action selector="setFiber:" destination="BYZ-38-t0r" eventType="touchUpInside" id="EAX-Wh-O58"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Hn-mG-UCU">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Hn-mG-UCU">
                                 <rect key="frame" x="19" y="442" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -242,7 +298,7 @@
                                     <action selector="setCarbohydrates:" destination="BYZ-38-t0r" eventType="touchUpInside" id="fm4-4o-aqf"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5sx-HA-qoK">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5sx-HA-qoK">
                                 <rect key="frame" x="281" y="442" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -252,7 +308,7 @@
                                     <action selector="setSuger:" destination="BYZ-38-t0r" eventType="touchUpInside" id="MmL-Ts-Uk7"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uP5-Uj-qbZ">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uP5-Uj-qbZ">
                                 <rect key="frame" x="20" y="484" width="73" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -262,7 +318,7 @@
                                     <action selector="setCholesterol:" destination="BYZ-38-t0r" eventType="touchUpInside" id="pyd-cM-3tQ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EH8-Dz-J4n">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EH8-Dz-J4n">
                                 <rect key="frame" x="102" y="316" width="75" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -275,7 +331,6 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4rd-kO-TDn">
                                 <rect key="frame" x="20" y="232" width="90" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
@@ -285,7 +340,6 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dlV-Cm-f68">
                                 <rect key="frame" x="185" y="232" width="95" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
@@ -295,7 +349,6 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tNy-T9-sEZ">
                                 <rect key="frame" x="20" y="270" width="90" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
@@ -305,14 +358,13 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OQ7-iN-9kk">
                                 <rect key="frame" x="185" y="270" width="95" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
                                     <action selector="WeightInput_four:" destination="BYZ-38-t0r" eventType="editingDidEnd" id="DeN-ii-EPS"/>
                                 </connections>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oWY-3L-Jt2">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oWY-3L-Jt2">
                                 <rect key="frame" x="124" y="231" width="53" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -321,7 +373,7 @@
                                     <action selector="setWeight_one:" destination="BYZ-38-t0r" eventType="touchUpInside" id="LoH-pc-WXb"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mcy-pN-j9I">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mcy-pN-j9I">
                                 <rect key="frame" x="288" y="232" width="68" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -330,7 +382,7 @@
                                     <action selector="setWeight_two:" destination="BYZ-38-t0r" eventType="touchUpInside" id="719-iY-Cc5"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qUs-lm-aZz">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qUs-lm-aZz">
                                 <rect key="frame" x="125" y="269" width="52" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -339,7 +391,7 @@
                                     <action selector="SetWeight_three:" destination="BYZ-38-t0r" eventType="touchUpInside" id="YuA-cb-qe0"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ySq-f6-v6H">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ySq-f6-v6H">
                                 <rect key="frame" x="288" y="269" width="68" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -351,7 +403,6 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter the number and click thebutton to set" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gEn-KV-DuW">
                                 <rect key="frame" x="105" y="488" width="250" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
@@ -361,7 +412,6 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="weight" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TNU-bA-lwN">
                                 <rect key="frame" x="20" y="526" width="97" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
@@ -371,14 +421,13 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="totalKCAL" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Xq7-S2-1m0">
                                 <rect key="frame" x="140" y="526" width="97" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
                                     <action selector="ForKcal:" destination="BYZ-38-t0r" eventType="editingDidEnd" id="dzs-in-g4h"/>
                                 </connections>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ssw-HO-QB3">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ssw-HO-QB3">
                                 <rect key="frame" x="20" y="564" width="74" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.0078431372550000003" green="0.59999999999999998" blue="0.76078431369999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -390,7 +439,6 @@
                             <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Kcal" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zR6-bk-7KI">
                                 <rect key="frame" x="258" y="526" width="97" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
@@ -428,7 +476,15 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="285.60000000000002" y="344.97751124437787"/>
+            <point key="canvasLocation" x="871" y="341"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

iFreshDemo_1.0/iFreshDemo/HomeViewController.h

@@ -0,0 +1,17 @@
+//
+//  HomeViewController.h
+//  iFreshDemo
+//
+//  Created by steven wu on 2021/6/23.
+//  Copyright © 2021 taolei. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HomeViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

iFreshDemo_1.0/iFreshDemo/HomeViewController.m

@@ -0,0 +1,98 @@
+//
+//  HomeViewController.m
+//  iFreshDemo
+//
+//  Created by steven wu on 2021/6/23.
+//  Copyright © 2021 taolei. All rights reserved.
+//
+
+#import "HomeViewController.h"
+#import "SearchDeviceVC.h"
+#import <iFreshSDK/iFreshSDK.h>
+
+@interface HomeViewController ()<BleReturnValueDelegate>
+
+@property (weak, nonatomic) IBOutlet UIButton *topButton;
+@property (weak, nonatomic) IBOutlet UILabel *weightLabel;
+
+@property (nonatomic, strong) iFreshDevice *connDevice;
+
+@end
+
+@implementation HomeViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+}
+
+
+- (IBAction)topButtonClick:(id)sender {
+    SearchDeviceVC *vc = [[SearchDeviceVC alloc] init];
+    vc.modalPresentationStyle = UIModalPresentationFullScreen;
+    __weak typeof(self) weakSelf = self;
+    vc.didSelectDeviceBlock = ^(iFreshDevice *device) {
+        weakSelf.connDevice = device;
+        [weakSelf.topButton setTitle:device.mac forState:(UIControlStateNormal)];
+        //begin to connect device
+        [weakSelf startToConnect];
+    };
+    [self presentViewController:vc animated:YES completion:nil];
+}
+
+- (void)startToConnect {
+    [[iFreshSDK shareManager] setbleReturnValueDelegate:self];
+    [[iFreshSDK shareManager] connectDevice:self.connDevice];
+}
+
+
+- (IBAction)changeUnitAction:(UIButton *)sender {
+    NSArray *unitArr = @[
+        @(UNIT_g),@(UNIT_ml),@(UNIT_lb),@(UNIT_oz),@(UNIT_kg),@(UNIT_jin),@(UNIT_LB)
+    ];
+
+    GN_UnitEnum unit = [unitArr[arc4random_uniform(unitArr.count)] intValue];
+    [[iFreshSDK shareManager] insertTheUnit:unit];
+}
+
+
+
+
+/**
+ *  Model model: value ble returns the value (model模型：value ble返还数值)
+ *
+ *  @param model Global Bluetooth model data(全局蓝牙模型数据)
+ */
+- (void)bleReturnValueModel:(iFreshModel*)model {
+    self.weightLabel.text = model.value;
+    NSLog(@"model.gValue = %ld",(long)model.gValue);//gValue为以“g”为单位的数据
+    NSLog(@"value == %@",model.value);
+}
+
+/**
+ * Proxy method triggered by end switching unit(称端切换单位触发的代理方法)
+ * GN_UnitEnum Unit enumeration(单位枚举)
+ * unitChang   Switched unit(切换后的单位)
+ */
+- (void)changeUnitWithBle:(GN_UnitEnum)unitChange{
+    NSLog(@"unitChange == %ld",unitChange);
+}
+
+/**
+ * Proxy method for changing Bluetooth connection status(蓝牙连接状态改变的代理方法)
+ * GN_BleStatus Bluetooth status enumeration(蓝牙状态枚举)
+ * bleStatus   Current Bluetooth status(当前蓝牙状态)
+ */
+- (void)bleStatusupdate:(GN_BleStatus)bleStatus{
+    if ( bleStatus == bleOpen || bleStatus == bleBreak) {
+        NSLog(@"蓝牙未连接");
+    }else if (bleStatus == bleOff){
+        NSLog(@"蓝牙未打开");
+    }else if (bleStatus == bleConnect){
+        NSLog(@"蓝牙已连接");
+    }
+}
+
+
+
+@end

iFreshDemo_1.0/iFreshDemo/SearchDeviceVC.h

@@ -0,0 +1,17 @@
+//
+//  AIFit-Demo
+//
+//  Created by iot_wz on 2018/9/1.
+//  Copyright © 2018年 iot_wz. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class iFreshDevice;
+@interface SearchDeviceVC : UIViewController
+
+@property (nonatomic, copy) void(^didSelectDeviceBlock)(iFreshDevice *device);
+
+@property (nonatomic, copy) void(^gobackBlock)(void);
+
+@end

iFreshDemo_1.0/iFreshDemo/SearchDeviceVC.m

@@ -0,0 +1,203 @@
+//
+//  AIFit-Demo
+//
+//  Created by iot_wz on 2018/9/1.
+//  Copyright © 2018年 iot_wz. All rights reserved.
+//
+
+#import "SearchDeviceVC.h"
+#import <iFreshSDK/iFreshSDK.h>
+
+@interface SearchDeviceVC () <UITableViewDelegate,UITableViewDataSource,BleReturnValueDelegate>
+{
+    CGFloat topDis;
+}
+
+@property (nonatomic, strong)UITableView *BleTableView;
+@property (nonatomic, strong) NSMutableArray *peripheralArray;   
+@property (nonatomic, assign) BOOL isAddPeripheraling;
+
+
+
+@end
+
+@implementation SearchDeviceVC
+
+#pragma mark - ================= 视图 ==========================
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor colorWithRed:235/255.0 green:250/255.0 blue:250/255.0 alpha:1.0];
+    
+    [self setupBackButton];
+    [self setupStartScanBtn];
+    [self setupStopScanBtn];
+    
+    [self setupTableView];
+    
+    [[iFreshSDK shareManager] bleDisconnect];
+    [[iFreshSDK shareManager] setbleReturnValueDelegate:self];
+    [[iFreshSDK shareManager] bleDoScan];
+  
+}
+
+- (void)bleStatusupdate:(GN_BleStatus)bleStatus {
+    
+    if ( bleStatus == bleOpen || bleStatus == bleBreak) {
+        NSLog(@"蓝牙未连接");
+    }else if (bleStatus == bleOff){
+        NSLog(@"蓝牙未打开");
+    }else if (bleStatus == bleConnect){
+        NSLog(@"蓝牙已连接");
+    }
+    
+}
+
+-(void)setupBackButton
+{
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeSystem];
+    topDis = (UIScreen.mainScreen.bounds.size.height == 812) ? (34+10) : (20+10);
+    btn.frame = CGRectMake(25, topDis, 250, 40);
+    [btn setTitle:@"<< BackAndCloseBLE" forState:UIControlStateNormal];
+    [btn setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
+    [btn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
+    [self.view addSubview:btn];
+    [btn addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
+}
+
+
+-(void)goBack
+{
+    [[iFreshSDK shareManager] bleDisconnect];
+    if (self.gobackBlock) {
+        self.gobackBlock();
+    }
+    [self dismissViewControllerAnimated:YES completion:nil];
+
+}
+
+
+- (void)setupStartScanBtn
+{
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeSystem];
+    btn.frame = CGRectMake(25, topDis+40+10, 100, 40);
+    [btn setTitle:@"start scan" forState:UIControlStateNormal];
+    [btn setTitleColor:[UIColor blueColor] forState:UIControlStateNormal];
+    btn.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:btn];
+    [btn addTarget:self action:@selector(scanPeripheral) forControlEvents:UIControlEventTouchUpInside];
+}
+
+
+- (void)setupStopScanBtn
+{
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeSystem];
+    btn.frame = CGRectMake(self.view.bounds.size.width-25-100, topDis+40+10, 100, 40);
+    [btn setTitle:@"stop scan" forState:UIControlStateNormal];
+    [btn setTitleColor:[UIColor blueColor] forState:UIControlStateNormal];
+    btn.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:btn];
+    [btn addTarget:self action:@selector(stopScan) forControlEvents:UIControlEventTouchUpInside];
+}
+
+- (void)setupTableView {
+    _BleTableView = [[UITableView alloc]init];
+    _BleTableView.frame = CGRectMake(25, topDis+50+50, self.view.bounds.size.width-50, self.view.bounds.size.height-(topDis+50+50)-20);
+    _BleTableView.dataSource = self;
+    _BleTableView.delegate = self;
+    [self.view addSubview:_BleTableView];
+}
+
+- (void)scanPeripheral
+{
+    [[iFreshSDK shareManager] bleDoScan];
+}
+
+- (void)stopScan
+{
+    [[iFreshSDK shareManager] bleStopScan];
+}
+
+
+#pragma mark - BluetoothManagerDelegate
+
+/**
+ *Callback Bluetooth  scanned devices（回调扫描到的设备）
+ */
+- (void)bleReturnScannedDevice:(iFreshDevice *)device
+{
+
+    if (self.isAddPeripheraling == YES) return;
+    
+    self.isAddPeripheraling = YES;
+    
+    BOOL willAdd = YES;
+    for (iFreshDevice *model in self.peripheralArray) //avoid add the same device
+    {
+        if ([model.mac isEqualToString:device.mac])
+        {
+            willAdd = NO;
+        }
+    }
+    
+    if (willAdd) {
+        [self.peripheralArray addObject:device];
+        [self.BleTableView reloadData];
+    }
+    
+    self.isAddPeripheraling = NO;
+    
+}
+
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.peripheralArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AIFitCell"];
+    if (!cell) {
+        cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"AIFitCell"];
+    }
+    
+    iFreshDevice *device = self.peripheralArray[indexPath.row];
+    cell.textLabel.text = device.peripheral.name;
+    cell.detailTextLabel.text = device.mac;
+
+    return cell;
+}
+
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [[iFreshSDK shareManager] bleStopScan];
+    
+    iFreshDevice *device = self.peripheralArray[indexPath.row];
+
+    if (_didSelectDeviceBlock) {
+        _didSelectDeviceBlock(device);
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+
+}
+
+
+#pragma mark - Setter and Getter
+
+- (NSMutableArray *)peripheralArray
+{
+    if (_peripheralArray == nil) {
+        _peripheralArray = [[NSMutableArray alloc] init];
+    }
+    return _peripheralArray;
+}
+
+- (void)dealloc
+{
+    NSLog(@"---class:%@ instance:%p  already dealloc!",self.class,self);
+}
+
+@end

iFreshDemo_1.0/iFreshDemo/ViewController.m

@@ -12,10 +12,11 @@
 
 @interface ViewController ()<UITableViewDelegate,UITableViewDataSource,BleReturnValueDelegate>
 {
-    NSIndexPath *selectIndexPath;    //Record the currently selected location
+    NSIndexPath *selectIndexPath;    //记录当前选择的位置
     NSString *unit;
 }
 
+
 @property (weak, nonatomic) IBOutlet UILabel *unitLabel;
 
 
@@ -43,18 +44,18 @@
     self.unitArray = @[@"g",@"ml",@"lb:oz",@"oz",@"kg",@"斤",@"lb"];
     [[iFreshSDK shareManager] setbleReturnValueDelegate:self];
     [[iFreshSDK shareManager] bleDoScan];
-    _bleStatus.adjustsFontSizeToFitWidth = YES;
     
     _weightLabel.userInteractionEnabled = NO;
     //
     UIButton * button = [UIButton buttonWithType:(UIButtonTypeCustom)];
     button.frame = CGRectMake(20, self.view.frame.size.height - 50, self.view.frame.size.width-40, 40);
-    [button setTitle:@"Unit setting" forState:(UIControlStateNormal)];
+    [button setTitle:@"单位设置" forState:(UIControlStateNormal)];
     [button setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
-    button.backgroundColor = [UIColor blueColor];
+    button.backgroundColor = [UIColor colorWithRed:43/255.0 green:142/255.0 blue:192/255.0 alpha:1.0];
     button.titleLabel.font = [UIFont systemFontOfSize:15];
     [self.view addSubview:button];
     [button addTarget:self action:@selector(buttonAction:) forControlEvents:(UIControlEventTouchUpInside)];
+    
 }
 -(void)buttonAction:(UIButton *)sender{
     UIAlertController * contrl = [UIAlertController alertControllerWithTitle:@"Please choose" message:@"" preferredStyle:(UIAlertControllerStyleAlert)];
@@ -101,33 +102,33 @@
     [self.view endEditing:YES];
 }
 
-#pragma mark ============ 蓝牙回调代理 ==============
+
 -(void)bluetoothManagerReturePenetrateData:(NSData *)data{
     NSLog(@"bluetoothManagerReturePenetrateData = %@",data.description);
 }
+
 - (void)bleStatusupdate:(GN_BleStatus)bleStatus {
     
     if ( bleStatus == bleOpen || bleStatus == bleBreak) {
-        _bleStatus.text = @"Not connected";
+        _bleStatus.text = @"蓝牙未连接";
     }else if (bleStatus == bleOff){
-        _bleStatus.text = @"Not turned on";
+        _bleStatus.text = @"蓝牙未打开";
     }else if (bleStatus == bleConnect){
-        _bleStatus.text = @"Connected";
-        
+        _bleStatus.text = @"蓝牙已连接";
     }
-    
 }
 
 - (void)bleReturnValueModel:(iFreshModel *)model{
-    
- //This code is written by the client beforehand. The app sends a set of data and sends a set of random data for total calories and calories. This code is closed when the data is written.
+//这段代码是之前客户要求写入的——app接收到一组数据就发送总卡路里和卡路里的一组随机数据，在执行写入数据时要把这段代码关闭，
     self.weightLabel.text = model.value;
-    NSLog(@"model.gValue=%ld",(long)model.gValue);
+    NSLog(@"model.gValue = %ld",(long)model.gValue);//gValue为以“g”为单位的数据
+    NSLog(@"value == %@",model.value);
+    
     if([_weightLabel.text integerValue] != 0) {
         _weightCount = [_weightLabel.text integerValue];
-        
+        //[[iFreshSDK shareManager] zeroWriteBle]; //删除这句,否则秤一直归0
     }
-    _unitLabel.text = model.Unit;
+    
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [[iFreshSDK shareManager] setWeight:_weightCount];
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -137,12 +138,13 @@
             });
         });
     });
+  
 }
 
 - (void)changeUnitWithBle:(GN_UnitEnum)unitChange{
-    
+    NSLog(@"unitChange == %ld",unitChange);
     if (unitChange == UNIT_g) {
-        unit = _unitArray[0];;
+        unit = _unitArray[0];
         _unitLabel.text = _unitArray[0];
         
     }else if (unitChange == UNIT_ml) {
@@ -168,11 +170,15 @@
         _unitLabel.text = _unitArray[6];
     }
     
-    //Get the current unit here
+    //在此获得当前称的单位
     NSLog(@"+++++++++++++%@",unit);
     [[NSUserDefaults standardUserDefaults] setObject:unit forKey:@"unitUnit"];
     [_unitTabView reloadData];
 }
+- (void)bleReturnDeviceType:(AiFrushDeviceType)deviceType{
+    NSLog(@"接收到的设备类型：%lu",(unsigned long)deviceType);
+}
+
 
 #pragma mark - UITableViewDelegate
 
@@ -271,7 +277,7 @@
     [self.unitTabView reloadData];
     
 }
-//2018-4-27 Weight setting
+//2018-4-27 重量设置
 
 - (IBAction)WeightInput_one:(UITextField *)sender {
   
@@ -319,7 +325,7 @@
     
     if ([iFreshSDK shareManager].isBle_Link == YES) {
         
-        [[iFreshSDK shareManager] closeBleAndDisconnect];
+        [[iFreshSDK shareManager] bleDisconnect];
 
     }else {
         
@@ -342,14 +348,14 @@
 
 
 - (IBAction)setweight:(UIButton *)sender {
-    //The analog input is 2000g, and the end return processing is 200g. You can set the weight value as needed. Can't exceed 65535
+    //模拟输入2000g，称端返回处理为200g，可根据需要自己设置重量值。不能超过65535
     [[iFreshSDK shareManager] setWeight:[_dataTextFiled.text integerValue]];
   
     
 }
 
 - (IBAction)setKcal:(UIButton *)sender {
-    NSLog(@"Setting calories，，，");
+    NSLog(@"设置卡路里，，，");
     [[iFreshSDK shareManager] setCalorie:[_dataTextFiled.text integerValue]];
 }
 

iFreshDemo_1.0/iFreshDemo/iFreshSDK.framework/Headers/AiFreshHeader.h

@@ -0,0 +1,73 @@
+
+//
+//  AiFreshHeader.h
+//  iFreshSDK
+//
+//  Created by iot_user on 2019/4/4.
+//  Copyright © 2019年 IOT. All rights reserved.
+//
+
+#ifndef AiFreshHeader_h
+#define AiFreshHeader_h
+
+typedef NS_ENUM(NSUInteger, AiFrushDeviceType) {
+    AiFrushDeviceTypeUnknown ,    //When not connected（未连接时）
+    AiFrushDeviceTypeAC04    ,    //AC04 scale does not support KG（AC04的秤不支持KG）
+    AiFrushDeviceTypeAC05    ,    //Some AC05 scales support KG（部分AC05的秤支持KG）
+};
+
+//咖啡定时功能
+typedef NS_ENUM(NSUInteger, BleCoffeeTimingWorkType) {
+    BleCoffeeTimingWorkTypeStart          = 1      , //Starting time（正计时开始）
+    BleCoffeeTimingWorkTypePositivePause  = 2      , //Positive timing pause（正计时暂停）
+    BleCoffeeTimingWorkTypeReset          = 3      , //reset(重置)
+    BleCoffeeTimingWorkTypeCountdownPause = 4      , //Countdown pause(倒计时暂停)
+};
+
+typedef enum : NSUInteger {
+    
+    UNIT_g = 0,  //g
+    UNIT_ml = 1, //
+    UNIT_lb = 2, //lb:oz
+    UNIT_oz = 3, //oz
+    UNIT_kg = 4, //kg
+    UNIT_jin = 5, //斤
+    UNIT_LB = 10,//lb
+    
+} GN_UnitEnum;
+
+
+typedef enum : NSUInteger {
+    
+    bleOpen  = 0,
+    bleOff,
+    bleConnect,
+    bleBreak
+    
+} GN_BleStatus;
+
+/**
+ 000 = 0 位小数(不带小数点); 001 = 1 位小数
+ 010 = 2 位小数; 011 = 3 位小数; 100 = 4 位小数 101 = 5 位小数; 110 = 6 位小数; 111 = 7 位小数
+ */
+typedef NS_ENUM(NSUInteger, PointType) {
+    PointType_0 = 0,
+    PointType_1 = 1,
+    PointType_2 = 2,
+    PointType_3 = 3,
+    PointType_4 = 4,
+    PointType_5 = 5,
+    PointType_6 = 6,
+    PointType_7 = 7,
+};
+
+//SDK 内部沙盒
+#define AiFreshlastUnit         @"AiFreshlastUnit"
+#define AiBrushFLAG             @"AiBrushFLAG"
+#define AiBrushPointCount       @"PointCount"
+#define AiBrushScalesType       @"ScalesTypeAC"
+#define ScalesTypeAC04          @"ac04"
+#define ScalesTypeAC05          @"ac05"
+
+
+#endif /* AiFreshHeader_h */

iFreshDemo_1.0/iFreshDemo/iFreshSDK.framework/Headers/iFreshDevice.h

@@ -0,0 +1,25 @@
+//
+//  iFreshDevice.h
+//  iFreshSDK
+//
+//  Created by steven wu on 2021/6/23.
+//  Copyright © 2021 IOT. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "AiFreshHeader.h"
+#import <CoreBluetooth/CoreBluetooth.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface iFreshDevice : NSObject
+
+@property (nonatomic, assign) AiFrushDeviceType deviceType;
+@property (nonatomic,copy)  NSString  *mac;      //蓝牙地址
+@property (nonatomic, strong) CBPeripheral  *peripheral;
+@property (nonatomic, strong) NSDictionary *advertisementData;
+@property (nonatomic, strong) NSNumber *RSSI;
+
+@end
+
+NS_ASSUME_NONNULL_END

iFreshDemo_1.0/iFreshDemo/iFreshSDK.framework/Headers/iFreshSDK.h

@@ -8,42 +8,8 @@
 
 #import <Foundation/Foundation.h>
 #import "iFreshModel.h"
-
-typedef NS_ENUM(NSUInteger, AiFrushDeviceType) {
-    AiFrushDeviceTypeUnknown ,    //When not connected（未连接时）
-    AiFrushDeviceTypeAC04    ,    //AC04 scale does not support KG（AC04的秤不支持KG）
-    AiFrushDeviceTypeAC05    ,    //Some AC05 scales support KG（部分AC05的秤支持KG）
-};
-
-//咖啡定时功能
-typedef NS_ENUM(NSUInteger, BleCoffeeTimingWorkType) {
-    BleCoffeeTimingWorkTypeStart          = 1      , //Starting time（正计时开始）
-    BleCoffeeTimingWorkTypePositivePause  = 2      , //Positive timing pause（正计时暂停）
-    BleCoffeeTimingWorkTypeReset          = 3      , //reset(重置)
-    BleCoffeeTimingWorkTypeCountdownPause = 4      , //Countdown pause(倒计时暂停)
-};
-
-typedef enum : NSUInteger {
-    
-    UNIT_g = 0,  //g
-    UNIT_ml = 1, //
-    UNIT_lb = 2, //lb:oz
-    UNIT_oz = 3, //oz
-    UNIT_kg = 4, //kg
-    UNIT_jin = 5, //斤
-    UNIT_LB = 10,//lb
-    
-} GN_UnitEnum;
-
-
-typedef enum : NSUInteger {
-    
-    bleOpen  = 0,
-    bleOff,
-    bleConnect,
-    bleBreak
-    
-} GN_BleStatus;
+#import "AiFreshHeader.h"
+#import "iFreshDevice.h"
 
 @protocol BleReturnValueDelegate <NSObject>
 @optional
@@ -81,6 +47,15 @@ typedef enum : NSUInteger {
  *deviceType:Bluetooth device type, default AiFrushDeviceTypeUnknown when no device is connected（蓝牙设备类型,未连接设备时，默认AiFrushDeviceTypeUnknown）
  */
 - (void)bleReturnDeviceType:(AiFrushDeviceType)deviceType;
+
+
+/**
+ *Callback Bluetooth  scanned devices（回调扫描到的设备）
+ */
+- (void)bleReturnScannedDevice:(iFreshDevice *)device;
+
+
+
 #pragma mark ============ Coffee scale callback（咖啡秤回调） ==============
 /**
  *Coffee scale support agent callback（咖啡秤支持的代理回调）
@@ -145,11 +120,15 @@ typedef enum : NSUInteger {
  *  start scaning(开始扫描)
  */
 - (void)bleDoScan;
+/**
+ *  stop scaning(停止扫描)
+ */
+- (void)bleStopScan;
 
 /**
  *  stop connect device(停止连接设备)
  */
-- (void)closeBleAndDisconnect;
+- (void)bleDisconnect;
 
 /**
  * Follow the protocol call(遵循协议的调用)
@@ -167,6 +146,23 @@ typedef enum : NSUInteger {
  * Return to zero(归零)
  */
 - (void)zeroWriteBle;
+
+
+/*
+ * Shutdown command（关机指令）
+ *
+ */
+- (void)turnOffDevice;
+
+/*
+ * The SDK is no longer automatically connected, so you should call the following methods to connect
+ * (SDK不再自动连接，需要App调用如下方法连接设备）
+ *
+ */
+- (void)connectDevice:(iFreshDevice *)device;
+
+#pragma mark ============ No longer use（不再使用） ==============
+
 /*
  Setting weight(设置重量)
  */
@@ -249,12 +245,6 @@ typedef enum : NSUInteger {
  */
 - (void)setSugar:(NSInteger)sugar;
 
-/*
- * Shutdown command（关机指令）
- *
- */
-- (void)turnOffDevice;
-
 
 #pragma mark ============ Coffee scale（咖啡秤） ==============
 //start the timer（开始计时）
@@ -268,4 +258,6 @@ typedef enum : NSUInteger {
 
 //APP reply stop alarm command（APP 回复停止报警指令)
 -(void)bluetoothManagerSendStopAlarm;
+
+
 @end