- 장치 삭제 Class Name 변경

OneCable.xcodeproj/project.pbxproj

@@ -179,10 +179,12 @@
 		A53C0DAF1E56E2F000E5D9F4 /* SocketServiceHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A53C0DAE1E56E2F000E5D9F4 /* SocketServiceHandler.m */; };
 		A573B2D61EA87ABD0021C385 /* SocketMsgModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A573B2D51EA87ABD0021C385 /* SocketMsgModel.m */; };
 		A5F267DA1E544A530096276E /* NSNetService+Util.m in Sources */ = {isa = PBXBuildFile; fileRef = A5F267D91E544A530096276E /* NSNetService+Util.m */; };
+		E20397631EC57CE7002443E5 /* ChangeDeviceNamePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = E20397611EC57CE7002443E5 /* ChangeDeviceNamePopupView.m */; };
+		E20397661EC57E9C002443E5 /* ChangeDeviceNamePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E20397651EC57E9C002443E5 /* ChangeDeviceNamePopupView.xib */; };
 		E2063B351EB0A1EB009025EA /* SettingsPasswdInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2063B341EB0A1EB009025EA /* SettingsPasswdInputViewController.m */; };
 		E216555E1EB0681500090EB6 /* ChangePhotoPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = E216555C1EB0681500090EB6 /* ChangePhotoPopupView.m */; };
 		E21655611EB0693E00090EB6 /* ChangePhotoPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E21655601EB0693E00090EB6 /* ChangePhotoPopupView.xib */; };
-		E2295F0B1E83857A008C5915 /* ThingsDelValveStartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2295F0A1E83857A008C5915 /* ThingsDelValveStartViewController.m */; };
+		E2295F0B1E83857A008C5915 /* ThingsGeneralDelStartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2295F0A1E83857A008C5915 /* ThingsGeneralDelStartViewController.m */; };
 		E251A87B1E933966004A70CF /* FaqViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E251A87A1E933966004A70CF /* FaqViewController.m */; };
 		E2A110371EA9EBF700EF9D66 /* SettingsNameSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A110321EA9EBF700EF9D66 /* SettingsNameSetViewController.m */; };
 		E2A110381EA9EBF700EF9D66 /* SettingsNumChangeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A110341EA9EBF700EF9D66 /* SettingsNumChangeViewController.m */; };
@@ -198,7 +200,7 @@
 		E2A252151E7F540700B3D007 /* QuizViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A2520F1E7F540700B3D007 /* QuizViewController.m */; };
 		E2A252161E7F540700B3D007 /* UserNameSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A252111E7F540700B3D007 /* UserNameSetViewController.m */; };
 		E2AA822D1E6FD652009B8077 /* MorePopOverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2AA822C1E6FD652009B8077 /* MorePopOverViewController.m */; };
-		E2BDF0431E838F970036468B /* ThingsDelValveCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2BDF0421E838F970036468B /* ThingsDelValveCompleteViewController.m */; };
+		E2BDF0431E838F970036468B /* ThingsGeneralDelCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2BDF0421E838F970036468B /* ThingsGeneralDelCompleteViewController.m */; };
 		E2E08CF91E8DDA5E0034D6F7 /* TempPwViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08CF81E8DDA5E0034D6F7 /* TempPwViewController.m */; };
 		E2E08CFC1E8DDA790034D6F7 /* IdFindViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08CFB1E8DDA790034D6F7 /* IdFindViewController.m */; };
 		E2E08CFF1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08CFE1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m */; };
@@ -209,9 +211,9 @@
 		E2E34E181E827B4D00BB8C96 /* ThingsAddInitCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E0D1E827B4D00BB8C96 /* ThingsAddInitCompleteViewController.m */; };
 		E2E34E191E827B4D00BB8C96 /* ThingsAddInitFailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E0F1E827B4D00BB8C96 /* ThingsAddInitFailViewController.m */; };
 		E2E34E1A1E827B4D00BB8C96 /* ThingsAddInitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E111E827B4D00BB8C96 /* ThingsAddInitViewController.m */; };
-		E2E34E1B1E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E131E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.m */; };
-		E2E34E1C1E827B4D00BB8C96 /* ThingsDelPlugViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E151E827B4D00BB8C96 /* ThingsDelPlugViewController.m */; };
-		E2E34E1D1E827B4D00BB8C96 /* ThingsDelValveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E171E827B4D00BB8C96 /* ThingsDelValveViewController.m */; };
+		E2E34E1B1E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E131E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.m */; };
+		E2E34E1C1E827B4D00BB8C96 /* ThingsForcedDelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E151E827B4D00BB8C96 /* ThingsForcedDelViewController.m */; };
+		E2E34E1D1E827B4D00BB8C96 /* ThingsGeneralDelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E171E827B4D00BB8C96 /* ThingsGeneralDelViewController.m */; };
 		E2EC102D1EC42DDE00607F8F /* MultiHomeHubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2EC102C1EC42DDE00607F8F /* MultiHomeHubViewController.m */; };
 		E2EC10301EC4655A00607F8F /* HomeHubSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2EC102F1EC4655A00607F8F /* HomeHubSearchViewController.m */; };
 		E2EC10331EC4658C00607F8F /* HomeHubSearchSuccessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2EC10321EC4658C00607F8F /* HomeHubSearchSuccessViewController.m */; };
@@ -548,14 +550,17 @@
 		A5F267D81E544A530096276E /* NSNetService+Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNetService+Util.h"; sourceTree = "<group>"; };
 		A5F267D91E544A530096276E /* NSNetService+Util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSNetService+Util.m"; sourceTree = "<group>"; };
 		ADE7CA33EFEB615D1B6CB053 /* Pods-OneCable.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneCable.adhoc.xcconfig"; path = "Pods/Target Support Files/Pods-OneCable/Pods-OneCable.adhoc.xcconfig"; sourceTree = "<group>"; };
+		E20397601EC57CE7002443E5 /* ChangeDeviceNamePopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeDeviceNamePopupView.h; sourceTree = "<group>"; };
+		E20397611EC57CE7002443E5 /* ChangeDeviceNamePopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangeDeviceNamePopupView.m; sourceTree = "<group>"; };
+		E20397651EC57E9C002443E5 /* ChangeDeviceNamePopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChangeDeviceNamePopupView.xib; sourceTree = "<group>"; };
 		E2063B331EB0A1EB009025EA /* SettingsPasswdInputViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsPasswdInputViewController.h; sourceTree = "<group>"; };
 		E2063B341EB0A1EB009025EA /* SettingsPasswdInputViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsPasswdInputViewController.m; sourceTree = "<group>"; };
 		E21000791E91C98A00D5C4AE /* IdFindViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdFindViewController.h; sourceTree = "<group>"; };
 		E216555B1EB0681500090EB6 /* ChangePhotoPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangePhotoPopupView.h; sourceTree = "<group>"; };
 		E216555C1EB0681500090EB6 /* ChangePhotoPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangePhotoPopupView.m; sourceTree = "<group>"; };
 		E21655601EB0693E00090EB6 /* ChangePhotoPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChangePhotoPopupView.xib; sourceTree = "<group>"; };
-		E2295F091E83857A008C5915 /* ThingsDelValveStartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelValveStartViewController.h; sourceTree = "<group>"; };
-		E2295F0A1E83857A008C5915 /* ThingsDelValveStartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveStartViewController.m; sourceTree = "<group>"; };
+		E2295F091E83857A008C5915 /* ThingsGeneralDelStartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsGeneralDelStartViewController.h; sourceTree = "<group>"; };
+		E2295F0A1E83857A008C5915 /* ThingsGeneralDelStartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsGeneralDelStartViewController.m; sourceTree = "<group>"; };
 		E251A8791E933966004A70CF /* FaqViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FaqViewController.h; sourceTree = "<group>"; };
 		E251A87A1E933966004A70CF /* FaqViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FaqViewController.m; sourceTree = "<group>"; };
 		E2A110311EA9EBF700EF9D66 /* SettingsNameSetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsNameSetViewController.h; sourceTree = "<group>"; };
@@ -585,8 +590,8 @@
 		E2A252111E7F540700B3D007 /* UserNameSetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserNameSetViewController.m; sourceTree = "<group>"; };
 		E2AA822B1E6FD652009B8077 /* MorePopOverViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MorePopOverViewController.h; sourceTree = "<group>"; };
 		E2AA822C1E6FD652009B8077 /* MorePopOverViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MorePopOverViewController.m; sourceTree = "<group>"; };
-		E2BDF0411E838F970036468B /* ThingsDelValveCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelValveCompleteViewController.h; sourceTree = "<group>"; };
-		E2BDF0421E838F970036468B /* ThingsDelValveCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveCompleteViewController.m; sourceTree = "<group>"; };
+		E2BDF0411E838F970036468B /* ThingsGeneralDelCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsGeneralDelCompleteViewController.h; sourceTree = "<group>"; };
+		E2BDF0421E838F970036468B /* ThingsGeneralDelCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsGeneralDelCompleteViewController.m; sourceTree = "<group>"; };
 		E2E08CF71E8DDA5E0034D6F7 /* TempPwViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempPwViewController.h; sourceTree = "<group>"; };
 		E2E08CF81E8DDA5E0034D6F7 /* TempPwViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempPwViewController.m; sourceTree = "<group>"; };
 		E2E08CFB1E8DDA790034D6F7 /* IdFindViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdFindViewController.m; sourceTree = "<group>"; };
@@ -605,12 +610,12 @@
 		E2E34E0F1E827B4D00BB8C96 /* ThingsAddInitFailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsAddInitFailViewController.m; sourceTree = "<group>"; };
 		E2E34E101E827B4D00BB8C96 /* ThingsAddInitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsAddInitViewController.h; sourceTree = "<group>"; };
 		E2E34E111E827B4D00BB8C96 /* ThingsAddInitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsAddInitViewController.m; sourceTree = "<group>"; };
-		E2E34E121E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelPlugCompleteViewController.h; sourceTree = "<group>"; };
-		E2E34E131E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelPlugCompleteViewController.m; sourceTree = "<group>"; };
-		E2E34E141E827B4D00BB8C96 /* ThingsDelPlugViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelPlugViewController.h; sourceTree = "<group>"; };
-		E2E34E151E827B4D00BB8C96 /* ThingsDelPlugViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelPlugViewController.m; sourceTree = "<group>"; };
-		E2E34E161E827B4D00BB8C96 /* ThingsDelValveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelValveViewController.h; sourceTree = "<group>"; };
-		E2E34E171E827B4D00BB8C96 /* ThingsDelValveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveViewController.m; sourceTree = "<group>"; };
+		E2E34E121E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsForcedDelCompleteViewController.h; sourceTree = "<group>"; };
+		E2E34E131E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsForcedDelCompleteViewController.m; sourceTree = "<group>"; };
+		E2E34E141E827B4D00BB8C96 /* ThingsForcedDelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsForcedDelViewController.h; sourceTree = "<group>"; };
+		E2E34E151E827B4D00BB8C96 /* ThingsForcedDelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsForcedDelViewController.m; sourceTree = "<group>"; };
+		E2E34E161E827B4D00BB8C96 /* ThingsGeneralDelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsGeneralDelViewController.h; sourceTree = "<group>"; };
+		E2E34E171E827B4D00BB8C96 /* ThingsGeneralDelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsGeneralDelViewController.m; sourceTree = "<group>"; };
 		E2EC0FD71E91CB7F00BA166D /* IdFindCompleteViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdFindCompleteViewController.h; sourceTree = "<group>"; };
 		E2EC102B1EC42DDE00607F8F /* MultiHomeHubViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiHomeHubViewController.h; sourceTree = "<group>"; };
 		E2EC102C1EC42DDE00607F8F /* MultiHomeHubViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultiHomeHubViewController.m; sourceTree = "<group>"; };
@@ -1209,16 +1214,19 @@
 				E2E34E0F1E827B4D00BB8C96 /* ThingsAddInitFailViewController.m */,
 				E2E34E101E827B4D00BB8C96 /* ThingsAddInitViewController.h */,
 				E2E34E111E827B4D00BB8C96 /* ThingsAddInitViewController.m */,
-				E2E34E121E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.h */,
-				E2E34E131E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.m */,
-				E2E34E141E827B4D00BB8C96 /* ThingsDelPlugViewController.h */,
-				E2E34E151E827B4D00BB8C96 /* ThingsDelPlugViewController.m */,
-				E2E34E161E827B4D00BB8C96 /* ThingsDelValveViewController.h */,
-				E2E34E171E827B4D00BB8C96 /* ThingsDelValveViewController.m */,
-				E2295F091E83857A008C5915 /* ThingsDelValveStartViewController.h */,
-				E2295F0A1E83857A008C5915 /* ThingsDelValveStartViewController.m */,
-				E2BDF0411E838F970036468B /* ThingsDelValveCompleteViewController.h */,
-				E2BDF0421E838F970036468B /* ThingsDelValveCompleteViewController.m */,
+				E2E34E121E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.h */,
+				E2E34E131E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.m */,
+				E2E34E141E827B4D00BB8C96 /* ThingsForcedDelViewController.h */,
+				E2E34E151E827B4D00BB8C96 /* ThingsForcedDelViewController.m */,
+				E2E34E161E827B4D00BB8C96 /* ThingsGeneralDelViewController.h */,
+				E2E34E171E827B4D00BB8C96 /* ThingsGeneralDelViewController.m */,
+				E2295F091E83857A008C5915 /* ThingsGeneralDelStartViewController.h */,
+				E2295F0A1E83857A008C5915 /* ThingsGeneralDelStartViewController.m */,
+				E2BDF0411E838F970036468B /* ThingsGeneralDelCompleteViewController.h */,
+				E2BDF0421E838F970036468B /* ThingsGeneralDelCompleteViewController.m */,
+				E20397601EC57CE7002443E5 /* ChangeDeviceNamePopupView.h */,
+				E20397611EC57CE7002443E5 /* ChangeDeviceNamePopupView.m */,
+				E20397651EC57E9C002443E5 /* ChangeDeviceNamePopupView.xib */,
 			);
 			path = ThingsScreens;
 			sourceTree = "<group>";
@@ -1389,6 +1397,7 @@
 				A13BD0621C3B491400C76527 /* ModifySecureKeyPopupView.xib in Resources */,
 				E2A21B971E9CD0720028CD9F /* CustomDatePopupView.xib in Resources */,
 				A13BD0DB1C3B563D00C76527 /* TimePickerPopupView.xib in Resources */,
+				E20397661EC57E9C002443E5 /* ChangeDeviceNamePopupView.xib in Resources */,
 				A13BD0E01C3B563D00C76527 /* WeatherLocationPopupView.xib in Resources */,
 				A13BD08A1C3B492A00C76527 /* Things.storyboard in Resources */,
 				A1A4548F1C47736D00BA805C /* ConfirmPasswdPopupView.xib in Resources */,
@@ -1496,7 +1505,7 @@
 				A13BD0121C3B491400C76527 /* DatePickerButton.m in Sources */,
 				A13BD0661C3B491400C76527 /* ThingsAddFailViewController.m in Sources */,
 				A13BCFF01C3B491400C76527 /* DeviceNodePopupView.m in Sources */,
-				E2295F0B1E83857A008C5915 /* ThingsDelValveStartViewController.m in Sources */,
+				E2295F0B1E83857A008C5915 /* ThingsGeneralDelStartViewController.m in Sources */,
 				A13BD0421C3B491400C76527 /* RulesAddViewController.m in Sources */,
 				A13BD0081C3B491400C76527 /* CustomImageView.m in Sources */,
 				A13BCFF71C3B491400C76527 /* MultiLevelPopupView.m in Sources */,
@@ -1532,7 +1541,7 @@
 				A13BD0D31C3B563D00C76527 /* ExternHeatPopupView.m in Sources */,
 				A13BCFE21C3B491400C76527 /* UIDevice-Reachability.m in Sources */,
 				A13BD01E1C3B491400C76527 /* SceneModel.m in Sources */,
-				E2E34E1B1E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.m in Sources */,
+				E2E34E1B1E827B4D00BB8C96 /* ThingsForcedDelCompleteViewController.m in Sources */,
 				E2E08CF91E8DDA5E0034D6F7 /* TempPwViewController.m in Sources */,
 				A191B48E1C4639F900DEBA91 /* AdminAuthPopupView.m in Sources */,
 				A13BCFFB1C3B491400C76527 /* OptionPopOverViewController.m in Sources */,
@@ -1577,15 +1586,16 @@
 				A13BD0451C3B491400C76527 /* RulesViewController.m in Sources */,
 				A13BD0401C3B491400C76527 /* ResetPwdViewController.m in Sources */,
 				A13BD0651C3B491400C76527 /* ThingsAddCompleteViewController.m in Sources */,
+				E20397631EC57CE7002443E5 /* ChangeDeviceNamePopupView.m in Sources */,
 				A13BD0671C3B491400C76527 /* ThingsAddIncludeViewController.m in Sources */,
 				A13BD00E1C3B491400C76527 /* CustomSwitch.m in Sources */,
 				A13BD0DA1C3B563D00C76527 /* TimePickerPopupView.m in Sources */,
 				E2A252131E7F540700B3D007 /* IDSetViewController.m in Sources */,
 				A13BCFE61C3B491400C76527 /* UIView+AutoLayoutDebugging.m in Sources */,
 				A13BD0251C3B491400C76527 /* WebBrowseViewController.m in Sources */,
-				E2E34E1C1E827B4D00BB8C96 /* ThingsDelPlugViewController.m in Sources */,
+				E2E34E1C1E827B4D00BB8C96 /* ThingsForcedDelViewController.m in Sources */,
 				A13BD0061C3B491400C76527 /* CustomButton.m in Sources */,
-				E2BDF0431E838F970036468B /* ThingsDelValveCompleteViewController.m in Sources */,
+				E2BDF0431E838F970036468B /* ThingsGeneralDelCompleteViewController.m in Sources */,
 				A13BD0561C3B491400C76527 /* AgreementViewController.m in Sources */,
 				A13BD01F1C3B491400C76527 /* CommonUtil.m in Sources */,
 				A16A1CC41C71728400F92BC1 /* NetworkServiceHandler.m in Sources */,
@@ -1630,7 +1640,7 @@
 				A13BCFE11C3B491400C76527 /* SortDictionary.m in Sources */,
 				A13BD0291C3B491400C76527 /* HomeHubInitViewController.m in Sources */,
 				E2A110381EA9EBF700EF9D66 /* SettingsNumChangeViewController.m in Sources */,
-				E2E34E1D1E827B4D00BB8C96 /* ThingsDelValveViewController.m in Sources */,
+				E2E34E1D1E827B4D00BB8C96 /* ThingsGeneralDelViewController.m in Sources */,
 				E2EC102D1EC42DDE00607F8F /* MultiHomeHubViewController.m in Sources */,
 				A13BCFE41C3B491400C76527 /* UITableView+EnumarateCells.m in Sources */,
 				E2EC10361EC465C800607F8F /* HomeHubSearchFailViewController.m in Sources */,

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelPlugCompleteViewController.h

@@ -1,28 +0,0 @@
-//
-//  ThingsDelPlugCompleteViewController.h
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 21..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "JDViewController.h"
-
-@class CustomLabel;
-@class CustomImageView;
-@class CustomButton;
-
-@interface ThingsDelPlugCompleteViewController : JDViewController
-
-
-@property (weak, nonatomic) IBOutlet UIView *maskView;
-@property (weak, nonatomic) IBOutlet UIView *popUpView;
-
-@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThingsSuccess; // 성공 이미지
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThingsFail; // 실패 이미지
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지
-@property (weak, nonatomic) IBOutlet CustomLabel *lblManufacturer; // 제조사 명
-@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm; // 확인
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelPlugCompleteViewController.m

@@ -1,34 +0,0 @@
-//
-//  ThingsDelPlugCompleteViewController.m
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 21..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "ThingsDelPlugCompleteViewController.h"
-#import "CustomLabel.h"
-#import "CustomButton.h"
-#import "CustomImageView.h"
-
-@interface ThingsDelPlugCompleteViewController ()
-
-@end
-
-@implementation ThingsDelPlugCompleteViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-
-}
-
-- (IBAction)btnConfirmTouched:(id)sender {
-    
-}
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelPlugViewController.h

@@ -1,30 +0,0 @@
-//
-//  ThingsDelPlugViewController.h
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 21..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "JDViewController.h"
-
-@class CustomLabel;
-@class CustomImageView;
-@class CustomButton;
-
-@interface ThingsDelPlugViewController : JDViewController
-
-
-
-@property (weak, nonatomic) IBOutlet UIView *maskView;
-@property (weak, nonatomic) IBOutlet UIView *popUpView;
-
-@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
-@property (weak, nonatomic) IBOutlet CustomLabel *lblComment; // 팝업 본문
-@property (weak, nonatomic) IBOutlet CustomImageView *imgLoading; // 로딩 이미지
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지
-@property (weak, nonatomic) IBOutlet CustomLabel *lblManufacturer; // 제조사 명
-@property (weak, nonatomic) IBOutlet CustomButton *btnCancel; // 취소
-@property (weak, nonatomic) IBOutlet CustomButton *btnStart; // 시작
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelPlugViewController.m

@@ -1,53 +0,0 @@
-//
-//  ThingsDelPlugViewController.m
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 21..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "ThingsDelPlugViewController.h"
-#import "CustomLabel.h"
-#import "CustomButton.h"
-#import "CustomImageView.h"
-
-// 오프라인 장치 강제 삭제
-@interface ThingsDelPlugViewController ()
-
-@end
-
-@implementation ThingsDelPlugViewController
-
-// 가스 밸브 타이틀 : 가스 밸브 삭제
-// 가스 밸브 삭제 코멘트 : 동일
-// 가스 밸브 이미지명 : img_things_product_addimg_01_smartgasvalve
-
-// 도어센서 타이틀 : 도어 센서 삭제
-// 도어센서 삭제 코멘트 : 동일
-// 도어센서 이미지 명 : img_things_product_addimg_02_mutisensor_door
-
-// 스마트플러그 타이틀 : 스마트 플러그 삭제
-// 스마트플러그 삭제 코멘트 : 동일
-// 스마트플러그 이미지 명 : img_things_product_addimg_03_smartplug
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-
-}
-
-- (IBAction)btnCancelTouched:(id)sender {
-    
-}
-
-- (IBAction)btnStartTouched:(id)sender {
-    
-}
-
-
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveCompleteViewController.h

@@ -1,34 +0,0 @@
-//
-//  ThingsDelValveCompleteViewController.h
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 23..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "JDViewController.h"
-
-@class CustomLabel;
-@class CustomImageView;
-@class CustomButton;
-
-@interface ThingsDelValveCompleteViewController : JDViewController
-
-
-@property (weak, nonatomic) IBOutlet UIView *maskView;
-@property (weak, nonatomic) IBOutlet UIView *popUpView;
-
-@property (weak, nonatomic) IBOutlet CustomImageView *imgStep; // 스텝 이미지
-@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThingsSuccess; // 성공 이미지
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThingsFail; // 실패 이미지
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지
-@property (weak, nonatomic) IBOutlet CustomLabel *lblManufacturer; // 제조사 명
-@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm; // 확인 버튼
-@property (weak, nonatomic) IBOutlet UIView *viewRetry; // 취소,재시도 버튼 뷰
-@property (weak, nonatomic) IBOutlet CustomButton *btnCancel; // 취소 버튼
-@property (weak, nonatomic) IBOutlet CustomButton *btnRetry; // 재시도 버튼
-
-
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveCompleteViewController.m

@@ -1,42 +0,0 @@
-//
-//  ThingsDelValveCompleteViewController.m
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 23..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "ThingsDelValveCompleteViewController.h"
-#import "CustomLabel.h"
-#import "CustomButton.h"
-#import "CustomImageView.h"
-
-@interface ThingsDelValveCompleteViewController ()
-
-@end
-
-@implementation ThingsDelValveCompleteViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-
-}
-
-
-- (IBAction)btnConfirmTouched:(id)sender {
-    
-}
-
-- (IBAction)btnCancelTouched:(id)sender {
-    
-}
-
-- (IBAction)btnRetryTouched:(id)sender {
-    
-}
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveStartViewController.h

@@ -1,29 +0,0 @@
-//
-//  ThingsDelValveStartViewController.h
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 23..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "JDViewController.h"
-
-@class CustomLabel;
-@class CustomImageView;
-@class CustomButton;
-
-@interface ThingsDelValveStartViewController : JDViewController
-
-
-@property (weak, nonatomic) IBOutlet UIView *maskView;
-@property (weak, nonatomic) IBOutlet UIView *popUpView;
-
-@property (weak, nonatomic) IBOutlet CustomImageView *imgStep; // 스텝 이미지
-@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
-@property (weak, nonatomic) IBOutlet CustomLabel *lblComment; // 팝업 본문
-@property (weak, nonatomic) IBOutlet CustomLabel *lblElapsedTime; // 타이머
-@property (weak, nonatomic) IBOutlet CustomImageView *imgLoading; // 타이머 이미지
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지
-@property (weak, nonatomic) IBOutlet CustomButton *btnCancel; // 취소
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveStartViewController.m

@@ -1,44 +0,0 @@
-//
-//  ThingsDelValveStartViewController.m
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 23..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "ThingsDelValveStartViewController.h"
-#import "CustomLabel.h"
-#import "CustomButton.h"
-#import "CustomImageView.h"
-
-@interface ThingsDelValveStartViewController ()
-
-@end
-// 가스밸브 타이틀 : 가스 밸브 센서 추가
-// 가스밸브 장치초기화 코멘트 : 밸브를 열림 상태에 두고 "위로" 버튼을 비프음이 날 때까지 5초 이상 누르세요.
-// 가스밸브 이미지 명 : img_things_product_addimg_01_smartgasvalve_wait
-
-// 도어센서 타이틀 : 도어 센서 추가
-// 도어센서 장치초기화 코멘트 : 센서 아래 버튼을 1회 누른 후 LED가 깜빡임을 멈추면 1회 더 누르세요.
-// 도어센서 이미지 명 : img_things_product_addimg_02_mutisensor_door_wait
-
-// 스마트플러그 타이틀 : 스마트 플러그 추가
-// 스마트플러그 장치초기화 코멘트 : 위에 버튼에 빨간 불이 깜빡일 때까지 5초 이상 누르세요.
-// 스마트플러그 이미지 명 : img_things_product_addimg_03_smartplug_wait
-
-@implementation ThingsDelValveStartViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-
-}
-- (IBAction)btnCancelTouched:(id)sender {
-    
-}
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveViewController.h

@@ -1,29 +0,0 @@
-//
-//  ThingsDelValveViewController.h
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 21..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "JDViewController.h"
-
-@class CustomLabel;
-@class CustomImageView;
-@class CustomButton;
-
-@interface ThingsDelValveViewController : JDViewController
-
-
-@property (weak, nonatomic) IBOutlet UIView *maskView;
-@property (weak, nonatomic) IBOutlet UIView *popUpView;
-
-@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
-@property (weak, nonatomic) IBOutlet CustomLabel *lblComment; // 팝업 본문
-@property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지
-@property (weak, nonatomic) IBOutlet CustomLabel *lblManufacturer; // 제조사 명
-@property (weak, nonatomic) IBOutlet CustomButton *btnCancel; // 취소
-@property (weak, nonatomic) IBOutlet CustomButton *btnStart; // 시작
-
-
-@end

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveViewController.m

@@ -1,38 +0,0 @@
-//
-//  ThingsDelValveViewController.m
-//  OneCable
-//
-//  Created by nComz on 2017. 3. 21..
-//  Copyright © 2017년 ntels. All rights reserved.
-//
-
-#import "ThingsDelValveViewController.h"
-#import "CustomLabel.h"
-#import "CustomButton.h"
-#import "CustomImageView.h"
-
-@interface ThingsDelValveViewController ()
-
-@end
-
-@implementation ThingsDelValveViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-
-}
-
-- (IBAction)btnCancelTouched:(id)sender {
-    
-}
-
-- (IBAction)btnStartTouched:(id)sender {
-    
-}
-
-@end