升级固件

DJMHomeTY/Global/Define/XHCommand.h

@@ -217,5 +217,6 @@
 #define DR05_HE_get_Version @"0500A6330240"//获取版本
 #define DR05_HE_get_Version @"0500A6330240"//获取版本
 #define DR05_HE_send_getUpdateVersion @"0500a63102aa"//发送固件升级
 #define DR05_HE_send_getUpdateVersion @"0500a63102aa"//发送固件升级
 #define DR05_HE_back_Version @"0700A6330140"//返回版本
 #define DR05_HE_back_Version @"0700A6330140"//返回版本
+#define DR05_HE_send_UpdateVersion @"0500613102aa"//返回版本
 
 
 #endif /* XHCommand_h */
 #endif /* XHCommand_h */

DJMHomeTY/Global/Define/XHURL.h

@@ -165,6 +165,11 @@
 /*海菲秀获取BANNER列表*/
 /*海菲秀获取BANNER列表*/
 #define HFXGetGiftLink [NSString stringWithFormat:@"%@%@",DRURL,@"/ldm/api/openurl/faceAgeH5"]
 #define HFXGetGiftLink [NSString stringWithFormat:@"%@%@",DRURL,@"/ldm/api/openurl/faceAgeH5"]
 
 
+/*热电获取视频列表*/
+#define RDGetVideoList [NSString stringWithFormat:@"%@%@",DRURL,@"/ldm/api/operateVideos"]
+
+/*热电获取智能调控能量和温度*/
+#define RDGetSmartRec [NSString stringWithFormat:@"%@%@",DRURL,@"/ldm/api/smartRec"]
 
 
 
 
 #endif /* XHURL_h */
 #endif /* XHURL_h */

DJMHomeTY/Page/DRFacial/Controller/DXHotElectricVC.m

@@ -665,7 +665,7 @@
         self.orderStatus = OrderStatusNAK;
         self.orderStatus = OrderStatusNAK;
     }else if([value isEqual:OTAUPGR]){
     }else if([value isEqual:OTAUPGR]){
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [HJGetBluetoothManager writeStr:[DR05_HE_send_getUpdateVersion withCrc16Modbus]];
+            [HJGetBluetoothManager writeStr:[DR05_HE_send_UpdateVersion withCrc16Modbus]];
 //            [SVProgressHUD showSuccessWithStatus:@"已发送升级指令"];
 //            [SVProgressHUD showSuccessWithStatus:@"已发送升级指令"];
         });
         });
         
         
@@ -739,14 +739,14 @@
         XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions,versions1];
         XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions,versions1];
         NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion);
         NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion);
         
         
-        if(!self.isChecked){
-            [self checkDeviceVersionWithResult:^(BOOL isUpdate) {
-
-            } binUrl:^(NSString *url) {
-
-            }];
-        }
-        [self bindMyDevice];
+//        if(!self.isChecked){
+//            [self checkDeviceVersionWithResult:^(BOOL isUpdate) {
+//
+//            } binUrl:^(NSString *url) {
+//
+//            }];
+//        }
+//        [self bindMyDevice];
     }
     }
     //版本号
     //版本号
     
     
@@ -1086,6 +1086,49 @@
 //    });
 //    });
 }
 }
 
 
+//状态
+-(void)didUpdateBluetoothStatus:(BluetoothStatus)status{
+    HJSelfWeak;
+    switch (status)
+    {
+            // 连接成功
+        case BluetoothStatusPoweredOff:
+        {
+            [SVProgressHUD showErrorWithStatus:HJLocalizedString(@"手机未开启蓝牙，请开启蓝牙重试！")];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [SVProgressHUD dismiss];
+            });
+        }
+            break;
+            // 连接成功
+        case BluetoothStatusConnectOk:
+        {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                [weakSelf setNavState:true];
+            });
+            [SVProgressHUD showSuccessWithStatus:HJLocalizedString(@"连接成功")];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [SVProgressHUD dismiss];
+            });
+            
+        }
+            break;
+        case BluetoothGetDeviceIDSuccessed:
+        {
+            
+        }
+            break;
+        case BluetoothStatusDisConnect:
+        {
+            HJGetBluetoothManager.noReconnect = false;
+        }
+            break;
+        default:
+            break;
+    }
+}
+
 -(void)onWriteBleData:(NSData*) data{
 -(void)onWriteBleData:(NSData*) data{
     //发送数据到终端设备
     //发送数据到终端设备
 //    [HJGetBluetoothManager  wirteBleOTAData:data];
 //    [HJGetBluetoothManager  wirteBleOTAData:data];

Pods/Target Support Files/Pods-HJMDrWarter/Pods-HJMDrWarter-frameworks.sh

@@ -41,7 +41,7 @@ install_framework()
 
 
   if [ -L "${source}" ]; then
   if [ -L "${source}" ]; then
     echo "Symlinked..."
     echo "Symlinked..."
-    source="$(readlink "${source}")"
+    source="$(readlink -f "${source}")"
   fi
   fi
 
 
   if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then
   if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then