摄像头分享和二维码生成规则修改

2020-05-16 17:17:21 +08:00
parent 9b266aea7b
commit aff0f33ec6
6 changed files with 136 additions and 23 deletions
@@ -46,7 +46,15 @@
    if ([self.erdevicemodel.deviceId isKindOfClass:[NSNumber class]]) {
        self.erdevicemodel.deviceId=[NSString stringWithFormat:@"%ld",self.erdevicemodel.deviceId.integerValue];
    }
-    NSString*str=[NSString stringWithFormat:@"deviceId=%@",self.erdevicemodel.deviceId.length?self.erdevicemodel.deviceId:[CommonUtils getNotNilStr:self.deviceid]];
+    NSString*type=@"deviceId";
+    if ([_erdevicemodel.type isEqualToString:DECICE_TYPE_XUANDUO3F]) {
+        type=@"petdeviceId";
+    }
+    else if (self.deviceid.length)
+    {
+        type=@"cameraId";
+    }
+    NSString*str=[NSString stringWithFormat:@"%@=%@",type,self.erdevicemodel.deviceId.length?self.erdevicemodel.deviceId:[CommonUtils getNotNilStr:self.deviceid]];
    self.erWeiMaView.image=[QRCodeGenerator qrImageForString:str imageSize:self.erWeiMaView.bounds.size.width];
    if ([self.erdevicemodel.type isEqualToString:DECICE_TYPE_XUANDUO3F])
    {