features:新绚多页面&设置页面&修改名字页面
This commit is contained in:
一只会编程的狮子
parent
f86f21bd42
commit
bc264e2d1f
|
|
@ -2708,6 +2708,10 @@
|
|||
E5F1B03B21183E9700A879A1 /* setting-restart.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03821183E9600A879A1 /* setting-restart.png */; };
|
||||
E5F1B03C21183E9700A879A1 /* setting-restart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03921183E9700A879A1 /* setting-restart@2x.png */; };
|
||||
E5F1B03F21184F9400A879A1 /* IFishHotpotUDPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E5F1B03D21184F9300A879A1 /* IFishHotpotUDPHelper.m */; };
|
||||
FAB3721122619DB70051E107 /* Xuanduo2fController.h in Headers */ = {isa = PBXBuildFile; fileRef = FAB3720E22619DB70051E107 /* Xuanduo2fController.h */; };
|
||||
FAB3721222619DB70051E107 /* Xuanduo2fController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB3720F22619DB70051E107 /* Xuanduo2fController.m */; };
|
||||
FAB3721322619DB70051E107 /* Xuanduo2fController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FAB3721022619DB70051E107 /* Xuanduo2fController.xib */; };
|
||||
FAB372152261E7EF0051E107 /* ifishdropview_set_device@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAB372142261E7EF0051E107 /* ifishdropview_set_device@2x.png */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
|
|
@ -6636,6 +6640,10 @@
|
|||
E5F1B03921183E9700A879A1 /* setting-restart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-restart@2x.png"; sourceTree = "<group>"; };
|
||||
E5F1B03D21184F9300A879A1 /* IFishHotpotUDPHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IFishHotpotUDPHelper.m; sourceTree = "<group>"; };
|
||||
E5F1B03E21184F9400A879A1 /* IFishHotpotUDPHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IFishHotpotUDPHelper.h; sourceTree = "<group>"; };
|
||||
FAB3720E22619DB70051E107 /* Xuanduo2fController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Xuanduo2fController.h; sourceTree = "<group>"; };
|
||||
FAB3720F22619DB70051E107 /* Xuanduo2fController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Xuanduo2fController.m; sourceTree = "<group>"; };
|
||||
FAB3721022619DB70051E107 /* Xuanduo2fController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Xuanduo2fController.xib; sourceTree = "<group>"; };
|
||||
FAB372142261E7EF0051E107 /* ifishdropview_set_device@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ifishdropview_set_device@2x.png"; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
|
|
@ -9367,6 +9375,7 @@
|
|||
882954ED1DBDA3A100E9DDD7 /* dropview2x */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
FAB372142261E7EF0051E107 /* ifishdropview_set_device@2x.png */,
|
||||
882954EE1DBDA3A100E9DDD7 /* equipment_icon_equipmentupdate@2x.png */,
|
||||
882954EF1DBDA3A100E9DDD7 /* ifish_dropview_add@2x.png */,
|
||||
882954F01DBDA3A100E9DDD7 /* ifish_jieBang_device@2x.png */,
|
||||
|
|
@ -10310,6 +10319,9 @@
|
|||
886185CC1EF255F900459AD1 /* XuToControlNameViewController.m */,
|
||||
886185CE1EF2561700459AD1 /* XuToControlName.h */,
|
||||
886185CF1EF2561700459AD1 /* XuToControlName.m */,
|
||||
FAB3720E22619DB70051E107 /* Xuanduo2fController.h */,
|
||||
FAB3720F22619DB70051E107 /* Xuanduo2fController.m */,
|
||||
FAB3721022619DB70051E107 /* Xuanduo2fController.xib */,
|
||||
);
|
||||
path = XuTo;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -14590,6 +14602,7 @@
|
|||
3D1C504B221A9EDF0096AE43 /* crc.h in Headers */,
|
||||
404D7CEB2238CF77005655F5 /* UIViewController+Swizzling.h in Headers */,
|
||||
3D1C5065221A9EDF0096AE43 /* avassert.h in Headers */,
|
||||
FAB3721122619DB70051E107 /* Xuanduo2fController.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -14663,7 +14676,7 @@
|
|||
8876A5821BB83447007A4B54 = {
|
||||
CreatedOnToolsVersion = 7.0;
|
||||
DevelopmentTeam = WFX8GD5HFX;
|
||||
ProvisioningStyle = Manual;
|
||||
ProvisioningStyle = Automatic;
|
||||
SystemCapabilities = {
|
||||
com.apple.AccessWiFi = {
|
||||
enabled = 1;
|
||||
|
|
@ -14900,6 +14913,7 @@
|
|||
88C1B2D41DD1ADB600C2C99A /* live_navicon_look@2x.png in Resources */,
|
||||
882955F61DBDA3A100E9DDD7 /* pumpopen.png in Resources */,
|
||||
885FBDC51E4C0CB400E0D7D1 /* explore_iocn_authentication@2x.png in Resources */,
|
||||
FAB3721322619DB70051E107 /* Xuanduo2fController.xib in Resources */,
|
||||
889C14F31EA7397B00470F50 /* personal_iocn_set.png in Resources */,
|
||||
883E78ED1D48A5E50030E075 /* ConnectWifiViewController.xib in Resources */,
|
||||
8807074B1DDD40B40076F65A /* P2PShareViewsec2Cell.xib in Resources */,
|
||||
|
|
@ -15629,6 +15643,7 @@
|
|||
883E79B31D48B0280030E075 /* MerchantCell.xib in Resources */,
|
||||
8829560F1DBDA3A100E9DDD7 /* neves0018.png in Resources */,
|
||||
882958201DC05EA700E9DDD7 /* equipment_background_camera.png in Resources */,
|
||||
FAB372152261E7EF0051E107 /* ifishdropview_set_device@2x.png in Resources */,
|
||||
882955F51DBDA3A100E9DDD7 /* pumpclose.png in Resources */,
|
||||
883E78341D48A5E50030E075 /* DetailViewController.xib in Resources */,
|
||||
88742AF11EF7C793006BF401 /* window_refrigeration@2x.png in Resources */,
|
||||
|
|
@ -16048,6 +16063,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
3D8F649721568AE500F04BD3 /* ConnectHotspotTipViewController.m in Sources */,
|
||||
FAB3721222619DB70051E107 /* Xuanduo2fController.m in Sources */,
|
||||
88F5EFAE1D48D08100CC7CAF /* AFURLConnectionOperation.m in Sources */,
|
||||
88602A231E10BC3500F3DB5D /* NIMInputAudioRecordIndicatorView.m in Sources */,
|
||||
88602F351E12002500F3DB5D /* UIScrollView+NTESPullToRefresh.m in Sources */,
|
||||
|
|
@ -17430,9 +17446,9 @@
|
|||
CLANG_CXX_LIBRARY = "compiler-default";
|
||||
CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
DEVELOPMENT_TEAM = WFX8GD5HFX;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
ENABLE_BITCODE = NO;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
|
|
@ -17528,7 +17544,7 @@
|
|||
PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE = "";
|
||||
PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDevelopment;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
TARGETED_DEVICE_FAMILY = 1;
|
||||
USER_HEADER_SEARCH_PATHS = "";
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
|
|
@ -17544,8 +17560,8 @@
|
|||
CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
DEVELOPMENT_TEAM = WFX8GD5HFX;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
ENABLE_BITCODE = NO;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
|
|
@ -17641,7 +17657,7 @@
|
|||
PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE = "";
|
||||
PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
TARGETED_DEVICE_FAMILY = 1;
|
||||
USER_HEADER_SEARCH_PATHS = "";
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "zaolang_selectd@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "dengguang_normal@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
BIN
Ifish/Assets.xcassets/绚多设备/dengguang_normal.imageset/dengguang_normal@2x.png
vendored
Normal file
BIN
Ifish/Assets.xcassets/绚多设备/dengguang_normal.imageset/dengguang_normal@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "dengguang_selected@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
BIN
Ifish/Assets.xcassets/绚多设备/dengguang_selected.imageset/dengguang_selected@2x.png
vendored
Normal file
BIN
Ifish/Assets.xcassets/绚多设备/dengguang_selected.imageset/dengguang_selected@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "huli_noraml@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "huli_selected@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "jiare_normal@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "jiare_selected@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "shajun_normal@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "shajun_selected@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "xuanduo_bg@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "xuanduo_bg@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 463 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 826 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "xunhuan_noraml.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "xunhuan_selected@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
BIN
Ifish/Assets.xcassets/绚多设备/xunhuan_selected.imageset/xunhuan_selected@2x.png
vendored
Normal file
BIN
Ifish/Assets.xcassets/绚多设备/xunhuan_selected.imageset/xunhuan_selected@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "zaolang_normal@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "zengyang_noraml.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "zengyang_selected@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
BIN
Ifish/Assets.xcassets/绚多设备/zengyang_selected.imageset/zengyang_selected@2x.png
vendored
Normal file
BIN
Ifish/Assets.xcassets/绚多设备/zengyang_selected.imageset/zengyang_selected@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
|
|
@ -5,7 +5,7 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>爱鱼奇TEST</string>
|
||||
<string>爱鱼奇</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.9.1</string>
|
||||
<string>4.9.2</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>540</string>
|
||||
<string>1.0</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
|
|
|
|||
|
|
@ -54,5 +54,8 @@
|
|||
+(void)saveXuToControlName:(XuToControlName *)nameModel;
|
||||
+(XuToControlName *)currentXuToControlName:(NSString *)macaddress;
|
||||
|
||||
//新绚多
|
||||
+(void)saveNewXuToControlName:(XuToControlName *)nameModel;
|
||||
+(XuToControlName *)currentNewXuToControlName:(NSString *)macaddress;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -214,5 +214,34 @@
|
|||
|
||||
}
|
||||
|
||||
+(void)saveNewXuToControlName:(XuToControlName *)nameModel
|
||||
{
|
||||
NSString *key = [NSString stringWithFormat:@"newXuTo%@",nameModel.macAddress];
|
||||
NSString *file = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:key];
|
||||
[NSKeyedArchiver archiveRootObject:nameModel toFile:file];
|
||||
}
|
||||
|
||||
+(XuToControlName *)currentNewXuToControlName:(NSString *)macaddress
|
||||
{
|
||||
NSString *key = [NSString stringWithFormat:@"newXuTo%@",macaddress];
|
||||
NSString *file = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:key];
|
||||
XuToControlName *controlName = [NSKeyedUnarchiver unarchiveObjectWithFile:file];
|
||||
if (!controlName||[controlName isKindOfClass:[NSNull class]]) {
|
||||
controlName = [[XuToControlName alloc] init];
|
||||
controlName.shajunLight = @"杀菌灯";
|
||||
controlName.zengyangPump = @"增氧泵";
|
||||
controlName.light1 = @"灯光1";
|
||||
controlName.light2 = @"灯光2";
|
||||
controlName.zaolangPump = @"造浪泵";
|
||||
controlName.huLiDeng = @"护理灯";
|
||||
controlName.xunhuanPump = @"循环泵";
|
||||
controlName.jiaRe = @"加热棒";
|
||||
controlName.macAddress = macaddress;
|
||||
}
|
||||
return controlName;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#import <Foundation/Foundation.h>
|
||||
|
||||
#import "ScanViewController.h"
|
||||
|
||||
#import "SonNuoCenterViewController.h"
|
||||
#import "YooseeCenterViewController.h"
|
||||
#import "DeviceCameraModel.h"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
#import "IfishCameraModel.h"
|
||||
#import "IfishNewsModel.h"
|
||||
#import "IfishHotBarVc.h"
|
||||
#import "Xuanduo2fController.h"
|
||||
|
||||
@implementation IfishDataUnity
|
||||
|
||||
|
|
@ -169,6 +170,12 @@
|
|||
tabVc.selectedIndex=0;
|
||||
UINavigationController*navVc=(UINavigationController*)tabVc.childViewControllers[tabVc.selectedIndex];
|
||||
[navVc pushViewController:barVc animated:YES];
|
||||
}else if([devicemodel.type isEqualToString:DECICE_TYPE_XUANDUO2F]){
|
||||
//绚多新设备
|
||||
Xuanduo2fController *xuanduo2fVc = [Xuanduo2fController new];
|
||||
xuanduo2fVc.currentDevice = devicemodel;
|
||||
UINavigationController *xuanduo2fNav=[[UINavigationController alloc]initWithRootViewController:xuanduo2fVc];
|
||||
[UIApplication sharedApplication].delegate.window.rootViewController = xuanduo2fNav;
|
||||
}
|
||||
else{
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@
|
|||
LoginData *data = [[NTESLoginManager sharedManager] currentLoginData];
|
||||
NSString *account = [data account];
|
||||
NSString *token = [data token];
|
||||
|
||||
//如果有缓存用户名密码推荐使用自动登录
|
||||
if ([account length] && [token length])
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
//绚多
|
||||
#define DECICE_TYPE_XUANDUOOF @"0f" //0x0f//无屏幕
|
||||
#define DECICE_TYPE_XUANDUO1F @"1f" //0x1f//有屏幕
|
||||
#define DECICE_TYPE_XUANDUO2F @"2f" //新设备
|
||||
|
||||
//可丽爱
|
||||
#define DECICE_TYPE_KELIAI @"aa" //0xaa
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
|
||||
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
|
|
@ -16,18 +15,18 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="49.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="top" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="redact_line_pointgray.png" translatesAutoresizingMaskIntoConstraints="NO" id="q3W-1j-qQp">
|
||||
<rect key="frame" x="19" y="0.0" width="12" height="50"/>
|
||||
<rect key="frame" x="27" y="-0.5" width="12" height="50.5"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="12" id="GmV-2W-O3d"/>
|
||||
<constraint firstAttribute="height" constant="50" id="i8f-Aa-EkD"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CH4" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PHo-dW-9EU">
|
||||
<rect key="frame" x="50" y="15" width="107" height="21"/>
|
||||
<rect key="frame" x="58" y="14.5" width="107" height="21"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="21" id="Us7-Ep-4KO"/>
|
||||
<constraint firstAttribute="width" constant="107" id="qhR-ln-Hdp"/>
|
||||
|
|
@ -44,7 +43,7 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="控制名" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uAq-Cs-djI">
|
||||
<rect key="frame" x="165" y="0.0" width="125" height="50"/>
|
||||
<rect key="frame" x="173" y="-0.5" width="109" height="50.5"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="50" id="6Eb-Kj-azk"/>
|
||||
</constraints>
|
||||
|
|
|
|||
|
|
@ -17,4 +17,13 @@
|
|||
@property(nonatomic,copy) NSString *jiaRe;
|
||||
@property(nonatomic,copy) NSString *macAddress;
|
||||
|
||||
@property(nonatomic,copy) NSString *shajunLight;
|
||||
@property(nonatomic,copy) NSString *zengyangPump;
|
||||
@property(nonatomic,copy) NSString *zaolangPump;
|
||||
@property(nonatomic,copy) NSString *xunhuanPump;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -18,6 +18,13 @@
|
|||
[aCoder encodeObject:_waterPump forKey:@"waterPump"];
|
||||
[aCoder encodeObject:_jiaRe forKey:@"jiaRe"];
|
||||
[aCoder encodeObject:_macAddress forKey:@"macAddress"];
|
||||
|
||||
//新绚多
|
||||
[aCoder encodeObject:_shajunLight forKey:@"shajunLight"];
|
||||
[aCoder encodeObject:_zengyangPump forKey:@"zengyangPump"];
|
||||
[aCoder encodeObject:_zaolangPump forKey:@"zaolangPump"];
|
||||
[aCoder encodeObject:_xunhuanPump forKey:@"xunhuanPump"];
|
||||
|
||||
}
|
||||
|
||||
-(id)initWithCoder:(NSCoder*)aDecoder{
|
||||
|
|
@ -31,7 +38,11 @@
|
|||
self.waterPump = [aDecoder decodeObjectForKey:@"waterPump"];
|
||||
self.jiaRe=[aDecoder decodeObjectForKey:@"jiaRe"];
|
||||
self.macAddress = [aDecoder decodeObjectForKey:@"macAddress"];
|
||||
|
||||
//新绚多
|
||||
self.shajunLight = [aDecoder decodeObjectForKey:@"shajunLight"];
|
||||
self.zengyangPump = [aDecoder decodeObjectForKey:@"zengyangPump"];
|
||||
self.zaolangPump = [aDecoder decodeObjectForKey:@"zaolangPump"];
|
||||
self.xunhuanPump = [aDecoder decodeObjectForKey:@"xunhuanPump"];
|
||||
}
|
||||
|
||||
return self;
|
||||
|
|
|
|||
|
|
@ -10,4 +10,6 @@
|
|||
|
||||
@interface XuToControlNameViewController : IfishDeviceControlNameBaseController
|
||||
|
||||
@property (nonatomic,assign) BOOL isNewdevice;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
}else{
|
||||
|
||||
return 6;
|
||||
return _isNewdevice?8:6;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -69,25 +69,62 @@
|
|||
cell.lineImgView.image = [UIImage imageNamed:@"redact_line_last"];
|
||||
|
||||
}
|
||||
NSArray *titles= @[@"气泵",@"灯1",@"灯2",@"护理灯",@"水泵",@"加热棒"];
|
||||
NSArray *titles;
|
||||
if (_isNewdevice) {
|
||||
titles = @[@"杀菌灯",@"增氧泵",@"灯光1",@"灯光2",@"造浪泵",@"护理灯",@"循环泵",@"加热棒"];
|
||||
}else {
|
||||
titles = @[@"气泵",@"灯1",@"灯2",@"护理灯",@"水泵",@"加热棒"];
|
||||
}
|
||||
if (indexPath.section==1) {
|
||||
cell.chTitle.text = titles[indexPath.row];
|
||||
}
|
||||
|
||||
//自定义名字
|
||||
XuToControlName *name = [UserExtendataArchaver currentXuToControlName:self.device.macAddress];
|
||||
XuToControlName *name;
|
||||
if (_isNewdevice) {
|
||||
name = [UserExtendataArchaver currentNewXuToControlName:self.device.macAddress];
|
||||
}else {
|
||||
name = [UserExtendataArchaver currentXuToControlName:self.device.macAddress];
|
||||
}
|
||||
if (indexPath.section==1&&indexPath.row==0) {
|
||||
cell.chName.text = name.airPump;
|
||||
|
||||
if (_isNewdevice) {
|
||||
cell.chName.text = name.shajunLight;
|
||||
}else {
|
||||
cell.chName.text = name.airPump;
|
||||
}
|
||||
}else if (indexPath.section==1&&indexPath.row==1){
|
||||
cell.chName.text = name.light1;
|
||||
if (_isNewdevice) {
|
||||
cell.chName.text = name.zengyangPump;
|
||||
}else{
|
||||
cell.chName.text = name.light1;
|
||||
}
|
||||
}else if (indexPath.section==1&&indexPath.row==2){
|
||||
cell.chName.text = name.light2;
|
||||
if (_isNewdevice) {
|
||||
cell.chName.text = name.light1;
|
||||
}else{
|
||||
cell.chName.text = name.light2;
|
||||
}
|
||||
}else if (indexPath.section==1&&indexPath.row==3){
|
||||
cell.chName.text = name.huLiDeng;
|
||||
if (_isNewdevice) {
|
||||
cell.chName.text = name.light2;
|
||||
}else{
|
||||
cell.chName.text = name.huLiDeng;
|
||||
}
|
||||
}else if (indexPath.section==1&&indexPath.row==4){
|
||||
cell.chName.text = name.waterPump;
|
||||
if (_isNewdevice) {
|
||||
cell.chName.text = name.zaolangPump;
|
||||
}else{
|
||||
cell.chName.text = name.waterPump;
|
||||
}
|
||||
}else if (indexPath.section==1&&indexPath.row==5){
|
||||
if (_isNewdevice) {
|
||||
cell.chName.text = name.huLiDeng;
|
||||
}else{
|
||||
cell.chName.text = name.jiaRe;
|
||||
}
|
||||
}else if (indexPath.section==1&&indexPath.row==6){
|
||||
cell.chName.text = name.xunhuanPump;
|
||||
}else if (indexPath.section==1&&indexPath.row==7){
|
||||
cell.chName.text = name.jiaRe;
|
||||
}
|
||||
cell.chName.delegate = self;
|
||||
|
|
@ -103,72 +140,176 @@
|
|||
XuToControlName *name = [[XuToControlName alloc] init];
|
||||
RuSunChangeNameTextViewCell*cell1 = [self.view viewWithTag:XUTOCHCELL_AIR];
|
||||
if (cell1.chName.text.length>3) {
|
||||
[self.view makeToast:@"气泵不能超过3个字"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"杀菌灯不能超过3个字"];
|
||||
}else {
|
||||
[self.view makeToast:@"气泵不能超过3个字"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (cell1.chName.text.length==0) {
|
||||
[self.view makeToast:@"气泵不能为空"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"杀菌灯不能为空"];
|
||||
}else {
|
||||
[self.view makeToast:@"气泵不能为空"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
name.airPump = cell1.chName.text;
|
||||
if (_isNewdevice) {
|
||||
name.shajunLight = cell1.chName.text;
|
||||
}else{
|
||||
name.airPump = cell1.chName.text;
|
||||
}
|
||||
|
||||
RuSunChangeNameTextViewCell*cell2 = [self.view viewWithTag:XUTOCHCELL_LIANGHT1];
|
||||
if (cell2.chName.text.length>3) {
|
||||
[self.view makeToast:@"灯1不能超过3个字"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"增氧泵不能超过3个字"];
|
||||
}else {
|
||||
[self.view makeToast:@"灯1不能超过3个字"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (cell2.chName.text.length==0) {
|
||||
[self.view makeToast:@"灯1不能为空"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"增氧泵不能为空"];
|
||||
}else {
|
||||
[self.view makeToast:@"灯1不能为空"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
name.light1 = cell2.chName.text;
|
||||
if (_isNewdevice) {
|
||||
name.zengyangPump = cell2.chName.text;
|
||||
}else{
|
||||
name.light1 = cell2.chName.text;
|
||||
}
|
||||
|
||||
RuSunChangeNameTextViewCell*cell3 = [self.view viewWithTag:XUTOCHCELL_LIANGHT2];
|
||||
if (cell3.chName.text.length>3) {
|
||||
[self.view makeToast:@"灯2不能超过3个字"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"灯光1不能超过3个字"];
|
||||
}else {
|
||||
[self.view makeToast:@"灯2不能超过3个字"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (cell3.chName.text.length==0) {
|
||||
[self.view makeToast:@"灯2不能为空"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"灯光1不能为空"];
|
||||
}else {
|
||||
[self.view makeToast:@"灯2不能为空"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
name.light2 = cell3.chName.text;
|
||||
if (_isNewdevice) {
|
||||
name.light1 = cell3.chName.text;
|
||||
}else {
|
||||
name.light2 = cell3.chName.text;
|
||||
}
|
||||
|
||||
RuSunChangeNameTextViewCell*cell4 = [self.view viewWithTag:XUTOCHCELL_HULI];
|
||||
if (cell4.chName.text.length>3) {
|
||||
[self.view makeToast:@"护理灯不能超过3个字"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"灯光2不能超过3个字"];
|
||||
}else {
|
||||
[self.view makeToast:@"护理灯不能超过3个字"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (cell4.chName.text.length==0) {
|
||||
[self.view makeToast:@"护理灯不能为空"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"灯光2不能为空"];
|
||||
}else {
|
||||
[self.view makeToast:@"护理灯不能为空"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
name.huLiDeng = cell4.chName.text;
|
||||
|
||||
if (_isNewdevice) {
|
||||
name.light2 = cell4.chName.text;
|
||||
}else {
|
||||
name.huLiDeng = cell4.chName.text;
|
||||
}
|
||||
RuSunChangeNameTextViewCell*cell5 = [self.view viewWithTag:XUTOCHCELL_WATER];
|
||||
if (cell5.chName.text.length>3) {
|
||||
[self.view makeToast:@"水泵不能超过3个字"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"造浪泵不能超过3个字"];
|
||||
}else {
|
||||
[self.view makeToast:@"水泵不能超过3个字"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (cell5.chName.text.length==0) {
|
||||
[self.view makeToast:@"水泵不能为空"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"造浪泵不能为空"];
|
||||
}else {
|
||||
[self.view makeToast:@"水泵不能为空"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
name.waterPump = cell5.chName.text;
|
||||
if (_isNewdevice) {
|
||||
name.zaolangPump = cell5.chName.text;
|
||||
}else {
|
||||
name.waterPump = cell5.chName.text;
|
||||
}
|
||||
|
||||
RuSunChangeNameTextViewCell*cell6 = [self.view viewWithTag:XUTOCHCELL_JIARE];
|
||||
if (cell6.chName.text.length>3) {
|
||||
[self.view makeToast:@"加热棒不能超过3个字"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"护理灯不能超过3个字"];
|
||||
}else {
|
||||
[self.view makeToast:@"加热棒不能超过3个字"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (cell6.chName.text.length==0) {
|
||||
[self.view makeToast:@"加热棒不能为空"];
|
||||
if (_isNewdevice) {
|
||||
[self.view makeToast:@"护理灯不能为空"];
|
||||
}else {
|
||||
[self.view makeToast:@"加热棒不能为空"];
|
||||
}
|
||||
return;
|
||||
}
|
||||
name.jiaRe = cell6.chName.text;
|
||||
if (_isNewdevice) {
|
||||
name.huLiDeng = cell6.chName.text;
|
||||
}else {
|
||||
name.jiaRe = cell6.chName.text;
|
||||
}
|
||||
|
||||
RuSunChangeNameTextViewCell*cell7 = [self.view viewWithTag:50006];
|
||||
if (cell7) {
|
||||
if (cell7.chName.text.length>3) {
|
||||
[self.view makeToast:@"循环泵不能超过3个字"];
|
||||
return;
|
||||
}
|
||||
if (cell7.chName.text.length==0) {
|
||||
[self.view makeToast:@"循环泵不能为空"];
|
||||
return;
|
||||
}
|
||||
|
||||
name.xunhuanPump = cell7.chName.text;
|
||||
}
|
||||
|
||||
RuSunChangeNameTextViewCell*cell8 = [self.view viewWithTag:50007];
|
||||
if (cell8) {
|
||||
if (cell8.chName.text.length>3) {
|
||||
[self.view makeToast:@"加热棒不能超过3个字"];
|
||||
return;
|
||||
}
|
||||
if (cell8.chName.text.length==0) {
|
||||
[self.view makeToast:@"加热棒不能为空"];
|
||||
return;
|
||||
}
|
||||
|
||||
name.jiaRe = cell8.chName.text;
|
||||
}
|
||||
|
||||
|
||||
name.macAddress = self.device.macAddress;
|
||||
[UserExtendataArchaver saveXuToControlName:name];
|
||||
if (_isNewdevice) {
|
||||
[UserExtendataArchaver saveNewXuToControlName:name];
|
||||
}else {
|
||||
[UserExtendataArchaver saveXuToControlName:name];
|
||||
}
|
||||
|
||||
[self upLoadDeviceName];
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
@property(nonatomic,strong)NSArray*titleArr;
|
||||
@property(nonatomic)BOOL isAuto;// 自动模式
|
||||
@property(nonatomic)UIActivityIndicatorView*indicatorView;
|
||||
/// 是否是新绚多设备
|
||||
@property(nonatomic,assign)BOOL isNewDevice;
|
||||
|
||||
-(void)addAlertView;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
#import "remindCyclePic.h"
|
||||
#import "BrightnessModel.h"
|
||||
#import "CreatErWeiMaController.h"
|
||||
#import "UINavigationBar+Background.h"
|
||||
|
||||
@interface XuToSetViewController ()
|
||||
{
|
||||
|
|
@ -67,7 +68,9 @@
|
|||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
// Do any additional setup after loading the view.
|
||||
|
||||
if (_isNewDevice) {
|
||||
[self.navigationController.navigationBar resetBackgroundImage];
|
||||
}
|
||||
_waterInfmodel=[[setRemindWaterModel alloc]init];
|
||||
[super viewDidLoad];
|
||||
_mainQueue = dispatch_get_main_queue();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
//
|
||||
// Xuanduo2fController.h
|
||||
// Ifish
|
||||
//
|
||||
// Created by Alex on 2019/4/13.
|
||||
// Copyright © 2019 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "WhiteNavBaseViewController.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface Xuanduo2fController : WhiteNavBaseViewController
|
||||
@property(nonatomic,strong) DeviceModel* currentDevice;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -0,0 +1,326 @@
|
|||
//
|
||||
// Xuanduo2fController.m
|
||||
// Ifish
|
||||
//
|
||||
// Created by Alex on 2019/4/13.
|
||||
// Copyright © 2019 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "Xuanduo2fController.h"
|
||||
#import "LXPopView.h"
|
||||
#import "DXPopover.h"
|
||||
#import "DeviceCameraModel.h"
|
||||
#import "XuToControlNameViewController.h"
|
||||
#import "IfishDataUnity.h"
|
||||
#import "XuToSetViewController.h"
|
||||
#import "CreatErWeiMaController.h"
|
||||
#import "XuToControlName.h"
|
||||
#import "UserExtendataArchaver.h"
|
||||
|
||||
@interface Xuanduo2fController ()<LxPopViewDelegate>
|
||||
@property(nonatomic,strong) DXPopover *popover;
|
||||
@property (weak, nonatomic) IBOutlet UIView *positionView;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *shajunLight;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *zengyangLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *light1Label;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *light2Label;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *zaolangLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *huliLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *xunhuanLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *jiareLabel;
|
||||
|
||||
@end
|
||||
|
||||
@implementation Xuanduo2fController
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated {
|
||||
[super viewWillAppear:animated];
|
||||
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName :[UIColor blackColor]};
|
||||
}
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
[self setup];
|
||||
// Do any additional setup after loading the view from its nib.
|
||||
}
|
||||
|
||||
- (void)setup{
|
||||
self.title = self.currentDevice.showName;
|
||||
//右侧菜单
|
||||
UIImage *MyEquipmentImage = [UIImage imageNamed:@"ifishnav_dropview_list"];
|
||||
UIButton *rightPopButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[rightPopButton setImage:MyEquipmentImage forState:UIControlStateNormal];
|
||||
rightPopButton.frame=CGRectMake(kScreenWidth-60,0,60,44);
|
||||
[rightPopButton setImageEdgeInsets:UIEdgeInsetsMake(0, 30, 0, 0)];
|
||||
|
||||
[rightPopButton addTarget:self action:@selector(presentPopView) forControlEvents:UIControlEventTouchUpInside];
|
||||
UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] initWithCustomView:rightPopButton];
|
||||
self.navigationItem.rightBarButtonItem =rightItem;
|
||||
[self initCHNames];
|
||||
}
|
||||
|
||||
#pragma -- actions --
|
||||
- (void)goBackAction{
|
||||
[[Socketsingleton sharedInstance] cutOffSocket];
|
||||
[[IfishDataUnity shareDataInstance] setAppTabRoot];
|
||||
}
|
||||
|
||||
- (IBAction)shajunAction:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)zengyangAction:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)dengguang1Action:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)dengguang2Action:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)zaoyangAction:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)huliAction:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)xunhuanAction:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
- (IBAction)jiareAction:(UIButton*)sender {
|
||||
sender.selected = !sender.selected;
|
||||
}
|
||||
|
||||
-(void)presentPopView{
|
||||
|
||||
UIImage *image = [UIImage imageNamed:@"popover_background_image_notrangle"];
|
||||
NSArray *titleImgs = nil;
|
||||
|
||||
NSArray *titles=nil;
|
||||
LXPopView *pop=[[LXPopView alloc] init];
|
||||
CGFloat popRowH=160*(image.size.height/image.size.width);
|
||||
//主控
|
||||
pop.frame = CGRectMake(0, 0, 160, 160*(image.size.height/image.size.width) + (popRowH -12)/2);
|
||||
titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"Ifish_share_device",@"ifishdropview_set_device"];
|
||||
|
||||
titles=@[@"修改名称",@"删除设备",@"分享设备",@"鱼缸设置"];
|
||||
pop.delegate = self;
|
||||
|
||||
pop.backgroundImage =image
|
||||
;
|
||||
pop.titles = titles;
|
||||
|
||||
pop.titleImgs =titleImgs;
|
||||
|
||||
DXPopover *popover = [DXPopover popover];
|
||||
|
||||
self.popover = popover;
|
||||
|
||||
popover.arrowSize = CGSizeMake(0.0,0.0);
|
||||
|
||||
[popover showAtView:_positionView withContentView:pop];
|
||||
NSLog(@"设备右侧pop");
|
||||
|
||||
}
|
||||
|
||||
#pragma mark - PopViewDelagate
|
||||
|
||||
-(void)disSelectedPopViewIndex:(NSIndexPath *)Index{
|
||||
|
||||
[self.popover dismiss];
|
||||
|
||||
if (Index.row == 0) {
|
||||
//修改名称
|
||||
[self shezhiMingCheng];
|
||||
|
||||
|
||||
}else if (Index.row == 1){
|
||||
//删除设备
|
||||
|
||||
[self deletDevice];
|
||||
|
||||
}else if (Index.row == 2){
|
||||
//分享设备
|
||||
[self fenXiangSheBei];
|
||||
}else if (Index.row == 3){
|
||||
[self setting];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#pragma mark - 修改设备名
|
||||
|
||||
-(void)shezhiMingCheng{
|
||||
XuToControlNameViewController *_changeNameVC = [[XuToControlNameViewController alloc] init];
|
||||
_changeNameVC.isNewdevice = YES;
|
||||
_changeNameVC.name = self.title;
|
||||
_changeNameVC.device = self.currentDevice;
|
||||
__weak typeof (self)wself = self;
|
||||
_changeNameVC.NameWithBlock = ^(NSString *nameStr){
|
||||
wself.title = nameStr;
|
||||
[wself initCHNames];
|
||||
};
|
||||
[ wself.navigationController pushViewController: _changeNameVC animated:YES];
|
||||
}
|
||||
|
||||
-(void)initCHNames{
|
||||
|
||||
XuToControlName *name = [UserExtendataArchaver currentNewXuToControlName:self.currentDevice.macAddress];
|
||||
self.shajunLight.text = name.shajunLight;
|
||||
self.zengyangLabel.text = name.zengyangPump;
|
||||
self.light1Label.text = name.light1;
|
||||
self.light2Label.text = name.light2;
|
||||
self.zaolangLabel.text = name.zaolangPump;
|
||||
self.huliLabel.text = name.huLiDeng;
|
||||
self.xunhuanLabel.text = name.xunhuanPump;
|
||||
self.jiareLabel.text = name.jiaRe;
|
||||
}
|
||||
|
||||
#pragma mark - 删除设备
|
||||
|
||||
-(void)deletDevice{
|
||||
|
||||
UIAlertController*ac=[UIAlertController alertControllerWithTitle:@"提示" message:@"确认删除设备?" preferredStyle:UIAlertControllerStyleAlert];
|
||||
|
||||
[self presentViewController:ac animated:YES completion:nil];
|
||||
[ac addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction*action){
|
||||
|
||||
|
||||
|
||||
}]];
|
||||
[ac addAction:[UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction*action){
|
||||
|
||||
|
||||
//先判断此设备是否有关联 摄像头
|
||||
|
||||
//DeviceModel*deviceModel=[_deviceArr objectAtIndex:indexpath.row];
|
||||
//要删除的设设备id
|
||||
|
||||
//存在则 解除关系 删除对应的cameraId
|
||||
NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"];
|
||||
|
||||
for (DeviceCameraModel *model in guanxiiArr) {
|
||||
|
||||
if (self.currentDevice.deviceId == model.deviceId ) {
|
||||
|
||||
|
||||
[guanxiiArr removeObject:model];
|
||||
//保存新关系数组
|
||||
[[DataCenter defaultDtacenter] setValue:guanxiiArr forKey:@"devicamerArr"];
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[self deleteDeviceRequset];
|
||||
|
||||
|
||||
}]];
|
||||
|
||||
}
|
||||
|
||||
-(void)deleteDeviceRequset{
|
||||
AFHTTPRequestOperationManager*mannager=[AFHTTPRequestOperationManager manager];
|
||||
mannager.responseSerializer=[AFHTTPResponseSerializer serializer];
|
||||
NSMutableDictionary * para = [NSMutableDictionary dictionary];
|
||||
|
||||
NSString *priId = self.currentDevice.deviceId;
|
||||
;
|
||||
NSString *userId = self.currentDevice.userId;
|
||||
|
||||
[para setValue:priId forKey:@"priId.deviceId"];
|
||||
[para setValue:userId forKey:@"priId.userId"];
|
||||
// __weak typeof (self)weakSelf=self;
|
||||
[mannager POST:kDeleteDeviceUser parameters:para success:^(AFHTTPRequestOperation *operation, id responseObject) {
|
||||
if (responseObject) {
|
||||
NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
|
||||
NSLog(@"result:%@",resultDic[@"result"]);
|
||||
if ([resultDic[@"result"] isEqualToString:@"100"]) {
|
||||
|
||||
[self showTitle:@"" messsage:@"删除成功"];
|
||||
//重置数据库
|
||||
NSArray*deviceArry=[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"];
|
||||
NSMutableArray *newArr = [NSMutableArray arrayWithArray:deviceArry];
|
||||
|
||||
for (DeviceModel *model in deviceArry) {
|
||||
|
||||
if ([model.deviceId isEqual:self.currentDevice.deviceId]) {
|
||||
|
||||
[newArr removeObject:model];
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[[DataCenter defaultDtacenter] setValue: newArr forKey:@"deviceInfo"];
|
||||
|
||||
if ([newArr count]==0) {
|
||||
|
||||
NSArray *cameraArr= [[DataCenter defaultDtacenter] valueForKey:@"cameraArr"];
|
||||
if ([cameraArr count]!=0) {
|
||||
[[Socketsingleton sharedInstance] cutOffSocket];
|
||||
}else{
|
||||
//两种设备都
|
||||
[[Socketsingleton sharedInstance] cutOffSocket];
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[[IfishDataUnity shareDataInstance] setAppTabRoot];
|
||||
|
||||
|
||||
}else if ([resultDic[@"result"] isEqualToString:@"101"]){
|
||||
|
||||
[self showTitle:@"" messsage:@"删除失败"];
|
||||
|
||||
}else if ([resultDic[@"result"] isEqualToString:@"301"]){
|
||||
|
||||
[self showTitle:@"" messsage:@"请求验证失败，请重新登陆"];
|
||||
|
||||
}else if ([resultDic[@"result"] isEqualToString:@"302"]){
|
||||
|
||||
[self showTitle:@"" messsage:@"请求被舍弃，未执行"];
|
||||
}
|
||||
}
|
||||
|
||||
} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
|
||||
|
||||
[self showTitle:@"" messsage:@"请求异常"];
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - 分享设备
|
||||
|
||||
-(void)fenXiangSheBei{
|
||||
|
||||
CreatErWeiMaController*vc=[[CreatErWeiMaController alloc]init];
|
||||
vc.isNewdevice = YES;
|
||||
vc.erdevicemodel=self.currentDevice;
|
||||
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
}
|
||||
|
||||
#pragma mark -设置页面 -
|
||||
- (void)setting {
|
||||
XuToSetViewController * _xuToSetVC=[[XuToSetViewController alloc] init];
|
||||
_xuToSetVC.currentdevice=self.currentDevice;
|
||||
_xuToSetVC.isNewDevice = YES;
|
||||
[self.navigationController pushViewController:_xuToSetVC animated:YES];
|
||||
}
|
||||
|
||||
-(void)showTitle:(NSString*)title messsage:(NSString*)message{
|
||||
UIAlertView *alert=[[UIAlertView alloc]initWithTitle:title message:message delegate:self cancelButtonTitle:nil otherButtonTitles:@"确定", nil];
|
||||
[alert show];
|
||||
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,313 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina5_9" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="Xuanduo2fController">
|
||||
<connections>
|
||||
<outlet property="huliLabel" destination="OLb-WT-tQ0" id="zfj-0D-wQW"/>
|
||||
<outlet property="jiareLabel" destination="r24-bR-0zZ" id="1FX-Ye-0ju"/>
|
||||
<outlet property="light1Label" destination="w1W-F8-kDG" id="9Tm-jx-s9C"/>
|
||||
<outlet property="light2Label" destination="k4O-MJ-aZd" id="dsc-dG-n76"/>
|
||||
<outlet property="positionView" destination="G1c-II-WK8" id="4Cm-FT-QIK"/>
|
||||
<outlet property="shajunLight" destination="zRG-Xz-MbP" id="LTQ-hk-FrW"/>
|
||||
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
|
||||
<outlet property="xunhuanLabel" destination="7KA-Hc-54C" id="QRq-jP-IC4"/>
|
||||
<outlet property="zaolangLabel" destination="BWx-iu-nY0" id="rxl-X0-mne"/>
|
||||
<outlet property="zengyangLabel" destination="Dse-Ih-U5R" id="sjC-JB-eMQ"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H1f-gs-HPh">
|
||||
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aik-7S-q8v" userLabel="Content View">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="600.66666666666663"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="xuanduo_bg" translatesAutoresizingMaskIntoConstraints="NO" id="EVp-Sm-Feq">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="260"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="260" id="V9N-xo-Uzm"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="鱼缸温度" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vcu-MT-d6F">
|
||||
<rect key="frame" x="156.66666666666666" y="320" width="62" height="18"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="15"/>
|
||||
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="94R-4Q-SUx">
|
||||
<rect key="frame" x="29.999999999999996" y="383" width="45.666666666666657" height="45.666666666666686"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="94R-4Q-SUx" secondAttribute="height" multiplier="1:1" id="zkk-3F-Fut"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="shajun_normal"/>
|
||||
<state key="selected" backgroundImage="shajun_selected"/>
|
||||
<connections>
|
||||
<action selector="shajunAction:" destination="-1" eventType="touchUpInside" id="tZ7-5v-2t8"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZVe-ED-kl7">
|
||||
<rect key="frame" x="119.66666666666669" y="383" width="46" height="45.666666666666686"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="ZVe-ED-kl7" secondAttribute="height" multiplier="1:1" id="Nyb-kW-maB"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="zengyang_noraml"/>
|
||||
<state key="selected" backgroundImage="zengyang_selected"/>
|
||||
<connections>
|
||||
<action selector="zengyangAction:" destination="-1" eventType="touchUpInside" id="pSk-Su-1AB"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WFc-cF-80l">
|
||||
<rect key="frame" x="209.66666666666666" y="383" width="45.666666666666657" height="45.666666666666686"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="WFc-cF-80l" secondAttribute="height" multiplier="1:1" id="KNO-vi-GYn"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="dengguang_normal"/>
|
||||
<state key="selected" backgroundImage="dengguang_selected"/>
|
||||
<connections>
|
||||
<action selector="dengguang1Action:" destination="-1" eventType="touchUpInside" id="MbL-ka-P6C"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RHd-Xx-AyG">
|
||||
<rect key="frame" x="299.33333333333331" y="383" width="45.666666666666686" height="45.666666666666686"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="RHd-Xx-AyG" secondAttribute="height" multiplier="1:1" id="npW-2w-QHd"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="dengguang_normal"/>
|
||||
<state key="selected" backgroundImage="dengguang_selected"/>
|
||||
<connections>
|
||||
<action selector="dengguang2Action:" destination="-1" eventType="touchUpInside" id="OSn-fc-Omj"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="杀菌灯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zRG-Xz-MbP">
|
||||
<rect key="frame" x="34.333333333333336" y="432.66666666666669" width="37.000000000000007" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="增氧泵" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dse-Ih-U5R">
|
||||
<rect key="frame" x="124" y="432.66666666666669" width="37" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="灯光1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w1W-F8-kDG">
|
||||
<rect key="frame" x="217" y="432.66666666666669" width="31" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="灯光2" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k4O-MJ-aZd">
|
||||
<rect key="frame" x="306" y="432.66666666666669" width="32" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="83l-yl-ndR">
|
||||
<rect key="frame" x="29.999999999999996" y="490.66666666666663" width="45.666666666666657" height="46"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="83l-yl-ndR" secondAttribute="height" multiplier="1:1" id="w6a-qu-5EK"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="zaolang_normal"/>
|
||||
<state key="selected" backgroundImage="zaolang_selectd"/>
|
||||
<connections>
|
||||
<action selector="zaoyangAction:" destination="-1" eventType="touchUpInside" id="APC-hG-sEM"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ucP-6q-kgn">
|
||||
<rect key="frame" x="119.66666666666669" y="490.66666666666663" width="46" height="46"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="ucP-6q-kgn" secondAttribute="height" multiplier="1:1" id="Vkv-7O-YZz"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="huli_noraml"/>
|
||||
<state key="selected" backgroundImage="huli_selected"/>
|
||||
<connections>
|
||||
<action selector="huliAction:" destination="-1" eventType="touchUpInside" id="mgh-an-HSm"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wZH-6A-6dN">
|
||||
<rect key="frame" x="209.66666666666666" y="490.66666666666663" width="45.666666666666657" height="46"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="wZH-6A-6dN" secondAttribute="height" multiplier="1:1" id="526-Hn-VeS"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="xunhuan_noraml"/>
|
||||
<state key="selected" backgroundImage="xunhuan_selected"/>
|
||||
<connections>
|
||||
<action selector="xunhuanAction:" destination="-1" eventType="touchUpInside" id="ok8-zP-Tig"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fFJ-1w-2f5">
|
||||
<rect key="frame" x="299.33333333333331" y="490.66666666666663" width="45.666666666666686" height="46"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="fFJ-1w-2f5" secondAttribute="height" multiplier="1:1" id="4jg-CV-sDI"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="jiare_normal"/>
|
||||
<state key="selected" backgroundImage="jiare_selected"/>
|
||||
<connections>
|
||||
<action selector="jiareAction:" destination="-1" eventType="touchUpInside" id="Mt5-Oe-uhg"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="造浪泵" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BWx-iu-nY0">
|
||||
<rect key="frame" x="34.333333333333336" y="540.66666666666663" width="37.000000000000007" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="护理灯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OLb-WT-tQ0">
|
||||
<rect key="frame" x="124" y="540.66666666666663" width="37" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="循环泵" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7KA-Hc-54C">
|
||||
<rect key="frame" x="214" y="540.66666666666663" width="37" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="加热棒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r24-bR-0zZ">
|
||||
<rect key="frame" x="303.66666666666669" y="540.66666666666663" width="37" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G1c-II-WK8">
|
||||
<rect key="frame" x="275" y="0.0" width="100" height="44"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="100" id="cOL-94-UdY"/>
|
||||
<constraint firstAttribute="height" constant="44" id="sb9-6y-9OZ"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="brS-3x-RcE">
|
||||
<rect key="frame" x="137.66666666666666" y="210" width="100" height="100"/>
|
||||
<color key="backgroundColor" red="0.70196078431372544" green="0.70196078431372544" blue="0.70196078431372544" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="100" id="GQu-NL-cde"/>
|
||||
<constraint firstAttribute="width" constant="100" id="PVA-da-FwT"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="30"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="layer.cornerRadius" value="50"/>
|
||||
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="WFc-cF-80l" firstAttribute="top" secondItem="ZVe-ED-kl7" secondAttribute="top" id="0BY-oG-gcd"/>
|
||||
<constraint firstItem="ZVe-ED-kl7" firstAttribute="width" secondItem="94R-4Q-SUx" secondAttribute="width" id="3se-2R-nR8"/>
|
||||
<constraint firstItem="vcu-MT-d6F" firstAttribute="top" secondItem="brS-3x-RcE" secondAttribute="bottom" constant="10" id="4B2-Mr-ob3"/>
|
||||
<constraint firstItem="OLb-WT-tQ0" firstAttribute="top" secondItem="ucP-6q-kgn" secondAttribute="bottom" constant="4" id="4Bf-gm-YTx"/>
|
||||
<constraint firstItem="k4O-MJ-aZd" firstAttribute="top" secondItem="RHd-Xx-AyG" secondAttribute="bottom" constant="4" id="6Bg-et-4ju"/>
|
||||
<constraint firstItem="G1c-II-WK8" firstAttribute="top" secondItem="aik-7S-q8v" secondAttribute="top" id="83E-pJ-8Fg"/>
|
||||
<constraint firstItem="ucP-6q-kgn" firstAttribute="top" secondItem="83l-yl-ndR" secondAttribute="top" id="9Cs-Lk-q7I"/>
|
||||
<constraint firstItem="RHd-Xx-AyG" firstAttribute="width" secondItem="94R-4Q-SUx" secondAttribute="width" id="A2B-qb-Kn1"/>
|
||||
<constraint firstItem="83l-yl-ndR" firstAttribute="top" secondItem="zRG-Xz-MbP" secondAttribute="bottom" constant="43" id="AAh-cS-gv0"/>
|
||||
<constraint firstItem="wZH-6A-6dN" firstAttribute="top" secondItem="ucP-6q-kgn" secondAttribute="top" id="B3z-EE-VMG"/>
|
||||
<constraint firstAttribute="bottom" secondItem="BWx-iu-nY0" secondAttribute="bottom" constant="45" id="BOU-73-VsD"/>
|
||||
<constraint firstItem="7KA-Hc-54C" firstAttribute="centerX" secondItem="wZH-6A-6dN" secondAttribute="centerX" id="CuI-89-MX4"/>
|
||||
<constraint firstItem="Dse-Ih-U5R" firstAttribute="centerX" secondItem="ZVe-ED-kl7" secondAttribute="centerX" id="D07-Uf-iIg"/>
|
||||
<constraint firstItem="EVp-Sm-Feq" firstAttribute="leading" secondItem="aik-7S-q8v" secondAttribute="leading" id="DPJ-uL-72p"/>
|
||||
<constraint firstItem="r24-bR-0zZ" firstAttribute="top" secondItem="fFJ-1w-2f5" secondAttribute="bottom" constant="4" id="DRU-RZ-TFh"/>
|
||||
<constraint firstItem="83l-yl-ndR" firstAttribute="width" secondItem="83l-yl-ndR" secondAttribute="height" multiplier="1:1" id="EnN-Rm-V1t"/>
|
||||
<constraint firstItem="fFJ-1w-2f5" firstAttribute="centerY" secondItem="wZH-6A-6dN" secondAttribute="centerY" id="HUF-tX-xdo"/>
|
||||
<constraint firstItem="94R-4Q-SUx" firstAttribute="leading" secondItem="aik-7S-q8v" secondAttribute="leading" constant="30" id="Hif-9z-wed"/>
|
||||
<constraint firstItem="OLb-WT-tQ0" firstAttribute="centerX" secondItem="ucP-6q-kgn" secondAttribute="centerX" id="LF8-uL-oh2"/>
|
||||
<constraint firstItem="BWx-iu-nY0" firstAttribute="centerX" secondItem="83l-yl-ndR" secondAttribute="centerX" id="LSK-ci-U11"/>
|
||||
<constraint firstItem="WFc-cF-80l" firstAttribute="width" secondItem="94R-4Q-SUx" secondAttribute="width" id="LyZ-Sb-suz"/>
|
||||
<constraint firstItem="EVp-Sm-Feq" firstAttribute="top" secondItem="aik-7S-q8v" secondAttribute="top" id="MJR-z4-zdi"/>
|
||||
<constraint firstItem="wZH-6A-6dN" firstAttribute="width" secondItem="wZH-6A-6dN" secondAttribute="height" multiplier="1:1" id="Mq3-8F-bRK"/>
|
||||
<constraint firstItem="7KA-Hc-54C" firstAttribute="top" secondItem="wZH-6A-6dN" secondAttribute="bottom" constant="4" id="N5M-Lr-gMP"/>
|
||||
<constraint firstItem="k4O-MJ-aZd" firstAttribute="centerX" secondItem="RHd-Xx-AyG" secondAttribute="centerX" id="O1e-yh-1dd"/>
|
||||
<constraint firstItem="wZH-6A-6dN" firstAttribute="leading" secondItem="ucP-6q-kgn" secondAttribute="trailing" constant="44" id="OWU-Aa-pW7"/>
|
||||
<constraint firstItem="ZVe-ED-kl7" firstAttribute="width" secondItem="ZVe-ED-kl7" secondAttribute="height" multiplier="1:1" id="Qyh-QP-HeZ"/>
|
||||
<constraint firstItem="RHd-Xx-AyG" firstAttribute="width" secondItem="RHd-Xx-AyG" secondAttribute="height" multiplier="1:1" id="T9h-Jc-mSP"/>
|
||||
<constraint firstItem="BWx-iu-nY0" firstAttribute="top" secondItem="83l-yl-ndR" secondAttribute="bottom" constant="4" id="TWl-21-aNy"/>
|
||||
<constraint firstItem="WFc-cF-80l" firstAttribute="leading" secondItem="ZVe-ED-kl7" secondAttribute="trailing" constant="44" id="TZx-fE-vtq"/>
|
||||
<constraint firstItem="brS-3x-RcE" firstAttribute="centerX" secondItem="aik-7S-q8v" secondAttribute="centerX" id="XdO-Ar-nOl"/>
|
||||
<constraint firstItem="fFJ-1w-2f5" firstAttribute="width" secondItem="fFJ-1w-2f5" secondAttribute="height" multiplier="1:1" id="Z0l-VK-2yG"/>
|
||||
<constraint firstItem="RHd-Xx-AyG" firstAttribute="leading" secondItem="WFc-cF-80l" secondAttribute="trailing" constant="44" id="aR0-vG-y0w"/>
|
||||
<constraint firstAttribute="trailing" secondItem="RHd-Xx-AyG" secondAttribute="trailing" constant="30" id="aep-VW-fb6"/>
|
||||
<constraint firstAttribute="trailing" secondItem="EVp-Sm-Feq" secondAttribute="trailing" id="c5c-iY-hT7"/>
|
||||
<constraint firstItem="w1W-F8-kDG" firstAttribute="centerX" secondItem="WFc-cF-80l" secondAttribute="centerX" id="eAc-A6-bC1"/>
|
||||
<constraint firstItem="zRG-Xz-MbP" firstAttribute="top" secondItem="94R-4Q-SUx" secondAttribute="bottom" constant="4" id="evS-XK-otX"/>
|
||||
<constraint firstItem="w1W-F8-kDG" firstAttribute="top" secondItem="WFc-cF-80l" secondAttribute="bottom" constant="4" id="fdq-SA-t2V"/>
|
||||
<constraint firstItem="ZVe-ED-kl7" firstAttribute="top" secondItem="94R-4Q-SUx" secondAttribute="top" id="ftU-GC-kl2"/>
|
||||
<constraint firstItem="Dse-Ih-U5R" firstAttribute="top" secondItem="ZVe-ED-kl7" secondAttribute="bottom" constant="4" id="gps-mw-vhM"/>
|
||||
<constraint firstItem="ucP-6q-kgn" firstAttribute="leading" secondItem="83l-yl-ndR" secondAttribute="trailing" constant="44" id="hbT-wu-CfZ"/>
|
||||
<constraint firstItem="WFc-cF-80l" firstAttribute="width" secondItem="WFc-cF-80l" secondAttribute="height" multiplier="1:1" id="hbj-Ne-Lm4"/>
|
||||
<constraint firstItem="83l-yl-ndR" firstAttribute="leading" secondItem="aik-7S-q8v" secondAttribute="leading" constant="30" id="hik-sv-fai"/>
|
||||
<constraint firstItem="fFJ-1w-2f5" firstAttribute="leading" secondItem="wZH-6A-6dN" secondAttribute="trailing" constant="44" id="ihK-ZO-1SS"/>
|
||||
<constraint firstItem="94R-4Q-SUx" firstAttribute="top" secondItem="vcu-MT-d6F" secondAttribute="bottom" constant="45" id="kES-AW-PEh"/>
|
||||
<constraint firstItem="ucP-6q-kgn" firstAttribute="width" secondItem="ucP-6q-kgn" secondAttribute="height" multiplier="1:1" id="kSM-tE-ZTg"/>
|
||||
<constraint firstItem="fFJ-1w-2f5" firstAttribute="width" secondItem="83l-yl-ndR" secondAttribute="width" id="ko6-sh-nUc"/>
|
||||
<constraint firstItem="r24-bR-0zZ" firstAttribute="centerX" secondItem="fFJ-1w-2f5" secondAttribute="centerX" id="lRc-52-x3D"/>
|
||||
<constraint firstItem="zRG-Xz-MbP" firstAttribute="centerX" secondItem="94R-4Q-SUx" secondAttribute="centerX" id="nOQ-wi-nav"/>
|
||||
<constraint firstItem="fFJ-1w-2f5" firstAttribute="width" secondItem="fFJ-1w-2f5" secondAttribute="height" multiplier="1:1" id="ns1-lf-YQG"/>
|
||||
<constraint firstItem="ucP-6q-kgn" firstAttribute="width" secondItem="ucP-6q-kgn" secondAttribute="height" multiplier="1:1" id="q0b-Ok-bD1"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fFJ-1w-2f5" secondAttribute="trailing" constant="30" id="s7v-x0-Wl5"/>
|
||||
<constraint firstAttribute="trailing" secondItem="G1c-II-WK8" secondAttribute="trailing" id="teN-7B-Npa"/>
|
||||
<constraint firstItem="RHd-Xx-AyG" firstAttribute="centerY" secondItem="WFc-cF-80l" secondAttribute="centerY" id="tpr-qz-KT0"/>
|
||||
<constraint firstItem="vcu-MT-d6F" firstAttribute="centerX" secondItem="aik-7S-q8v" secondAttribute="centerX" id="uKM-H9-GFY"/>
|
||||
<constraint firstItem="ucP-6q-kgn" firstAttribute="width" secondItem="83l-yl-ndR" secondAttribute="width" id="wEN-Jf-FpP"/>
|
||||
<constraint firstItem="brS-3x-RcE" firstAttribute="top" secondItem="EVp-Sm-Feq" secondAttribute="bottom" constant="-50" id="wy8-b5-lgU"/>
|
||||
<constraint firstItem="wZH-6A-6dN" firstAttribute="width" secondItem="83l-yl-ndR" secondAttribute="width" id="x5W-Jy-Jg5"/>
|
||||
<constraint firstItem="ZVe-ED-kl7" firstAttribute="leading" secondItem="94R-4Q-SUx" secondAttribute="trailing" constant="44" id="xJf-ZK-IiA"/>
|
||||
<constraint firstItem="wZH-6A-6dN" firstAttribute="width" secondItem="wZH-6A-6dN" secondAttribute="height" multiplier="1:1" id="ypx-oz-Dp1"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="aik-7S-q8v" firstAttribute="width" secondItem="H1f-gs-HPh" secondAttribute="width" id="IhU-zL-IF8"/>
|
||||
<constraint firstItem="aik-7S-q8v" firstAttribute="leading" secondItem="H1f-gs-HPh" secondAttribute="leading" id="h82-56-9Cd"/>
|
||||
<constraint firstItem="aik-7S-q8v" firstAttribute="top" secondItem="H1f-gs-HPh" secondAttribute="top" id="nGr-wa-HOB"/>
|
||||
<constraint firstAttribute="bottom" secondItem="aik-7S-q8v" secondAttribute="bottom" id="qPp-BM-jkb"/>
|
||||
<constraint firstAttribute="trailing" secondItem="aik-7S-q8v" secondAttribute="trailing" id="yXz-ed-gO7"/>
|
||||
</constraints>
|
||||
</scrollView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="H1f-gs-HPh" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="UZV-yH-Ib3"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="H1f-gs-HPh" secondAttribute="trailing" id="jtx-aY-gwy"/>
|
||||
<constraint firstItem="H1f-gs-HPh" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" id="vcl-46-Voo"/>
|
||||
<constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="H1f-gs-HPh" secondAttribute="bottom" id="xoh-oW-kFY"/>
|
||||
</constraints>
|
||||
<nil key="simulatedTopBarMetrics"/>
|
||||
<viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
|
||||
<point key="canvasLocation" x="93.599999999999994" y="154.27286356821591"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="dengguang_normal" width="52" height="52"/>
|
||||
<image name="dengguang_selected" width="52" height="52"/>
|
||||
<image name="huli_noraml" width="52" height="52"/>
|
||||
<image name="huli_selected" width="52" height="52"/>
|
||||
<image name="jiare_normal" width="52" height="52"/>
|
||||
<image name="jiare_selected" width="52" height="52"/>
|
||||
<image name="shajun_normal" width="52.5" height="52.5"/>
|
||||
<image name="shajun_selected" width="52.5" height="52.5"/>
|
||||
<image name="xuanduo_bg" width="843.75" height="586.5"/>
|
||||
<image name="xunhuan_noraml" width="104" height="104"/>
|
||||
<image name="xunhuan_selected" width="52" height="52"/>
|
||||
<image name="zaolang_normal" width="52" height="52"/>
|
||||
<image name="zaolang_selectd" width="52" height="52"/>
|
||||
<image name="zengyang_noraml" width="105" height="105"/>
|
||||
<image name="zengyang_selected" width="52.5" height="52.5"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
#import "BaseVIewContorller.h"
|
||||
#import "DeviceModel.h"
|
||||
@interface CreatErWeiMaController : BaseVIewContorller
|
||||
@property (assign, nonatomic) BOOL isNewdevice;
|
||||
@property (weak, nonatomic) IBOutlet UIView *erBackView;
|
||||
@property (weak, nonatomic) IBOutlet UIImageView *erWeiMaView;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#import "CreatErWeiMaController.h"
|
||||
#import "QRCodeGenerator.h"
|
||||
#import "DeviceModel.h"
|
||||
#import "UINavigationBar+Background.h"
|
||||
@interface CreatErWeiMaController ()
|
||||
@property(nonatomic,strong)NSArray*arry;
|
||||
@end
|
||||
|
|
@ -25,7 +26,9 @@
|
|||
self.view.backgroundColor=COLOR_MIAN;
|
||||
[self creatEr];
|
||||
[self.view bringSubviewToFront:self.erWeiMaView];
|
||||
|
||||
if (_isNewdevice) {
|
||||
[self.navigationController.navigationBar resetBackgroundImage];
|
||||
}
|
||||
}
|
||||
-(void)creatEr{
|
||||
// NSUserDefaults*userfult=[NSUserDefaults standardUserDefaults];
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Loading…
Reference in New Issue