派生自 ~xm/HomeApp
ZigbeeApp/Elian.iOS/Elian.iOS.csprojold mode 100644 new mode 100755
@@ -31,9 +31,6 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Xamarin.iOS" /> <Reference Include="MQTTnet"> <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -55,5 +52,4 @@ </NativeReference> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" /> <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" /> </Project> ZigbeeApp/GateWay.Droid/Assets/Phone/SmartSound/CheckBoxDef.pngBinary files differ
ZigbeeApp/GateWay.Droid/Assets/Phone/SmartSound/CheckBoxSel.pngBinary files differ
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -2371,12 +2371,6 @@ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\SmartSound\CheckBoxDef.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\SmartSound\CheckBoxSel.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\SmartSound\Nickname.png" /> </ItemGroup> <ItemGroup> ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120091501" android:installLocation="auto" android:versionName="1.1.0120091501"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120092101" android:installLocation="auto" android:versionName="1.1.0120092101"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" /> <permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -26,6 +26,9 @@ public static void UpdateIdValues() { global::ZXing.Mobile.Resource.Id.contentFrame = global::GateWay.Droid.Resource.Id.contentFrame; global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::GateWay.Droid.Resource.Layout.zxingscanneractivitylayout; global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::GateWay.Droid.Resource.Layout.zxingscannerfragmentlayout; } public partial class Animation @@ -3241,109 +3244,112 @@ public const int content = 2131296325; // aapt resource value: 0x7F090046 public const int contentPanel = 2131296326; public const int contentFrame = 2131296326; // aapt resource value: 0x7F090047 public const int content_container = 2131296327; public const int contentPanel = 2131296327; // aapt resource value: 0x7F090048 public const int coordinator = 2131296328; public const int content_container = 2131296328; // aapt resource value: 0x7F090049 public const int coordinator = 2131296329; // aapt resource value: 0x7F090001 public const int CTRL = 2131296257; // aapt resource value: 0x7F090049 public const int custom = 2131296329; // aapt resource value: 0x7F090002 public const int Custom = 2131296258; // aapt resource value: 0x7F09004A public const int custom = 2131296330; // aapt resource value: 0x7F090003 public const int CustomLabel = 2131296259; // aapt resource value: 0x7F09004A public const int customPanel = 2131296330; // aapt resource value: 0x7F09004B public const int day = 2131296331; public const int customPanel = 2131296331; // aapt resource value: 0x7F09004C public const int decor_content_parent = 2131296332; public const int day = 2131296332; // aapt resource value: 0x7F09004D public const int default_activity_button = 2131296333; public const int decor_content_parent = 2131296333; // aapt resource value: 0x7F09004E public const int description = 2131296334; public const int default_activity_button = 2131296334; // aapt resource value: 0x7F09004F public const int design_bottom_sheet = 2131296335; public const int description = 2131296335; // aapt resource value: 0x7F090050 public const int design_menu_item_action_area = 2131296336; public const int design_bottom_sheet = 2131296336; // aapt resource value: 0x7F090051 public const int design_menu_item_action_area_stub = 2131296337; public const int design_menu_item_action_area = 2131296337; // aapt resource value: 0x7F090052 public const int design_menu_item_text = 2131296338; public const int design_menu_item_action_area_stub = 2131296338; // aapt resource value: 0x7F090053 public const int design_navigation_view = 2131296339; public const int design_menu_item_text = 2131296339; // aapt resource value: 0x7F090054 public const int disableHome = 2131296340; public const int design_navigation_view = 2131296340; // aapt resource value: 0x7F090055 public const int disableReportBytes = 2131296341; public const int disableHome = 2131296341; // aapt resource value: 0x7F090056 public const int edit_query = 2131296342; public const int disableReportBytes = 2131296342; // aapt resource value: 0x7F090057 public const int enableReportBytes = 2131296343; public const int edit_query = 2131296343; // aapt resource value: 0x7F090058 public const int end = 2131296344; public const int enableReportBytes = 2131296344; // aapt resource value: 0x7F090059 public const int end_padder = 2131296345; public const int end = 2131296345; // aapt resource value: 0x7F09005A public const int enterAlways = 2131296346; public const int end_padder = 2131296346; // aapt resource value: 0x7F09005B public const int enterAlwaysCollapsed = 2131296347; public const int enterAlways = 2131296347; // aapt resource value: 0x7F09005C public const int exitUntilCollapsed = 2131296348; // aapt resource value: 0x7F09005E public const int expanded_menu = 2131296350; public const int enterAlwaysCollapsed = 2131296348; // aapt resource value: 0x7F09005D public const int expand_activities_button = 2131296349; public const int exitUntilCollapsed = 2131296349; // aapt resource value: 0x7F09005F public const int expanded_menu = 2131296351; // aapt resource value: 0x7F09005E public const int expand_activities_button = 2131296350; // aapt resource value: 0x7F090004 public const int FILL = 2131296260; // aapt resource value: 0x7F09005F public const int fill = 2131296351; // aapt resource value: 0x7F090060 public const int fill_horizontal = 2131296352; public const int fill = 2131296352; // aapt resource value: 0x7F090061 public const int fill_horizontal = 2131296353; // aapt resource value: 0x7F090005 public const int FILL_STROKE = 2131296261; // aapt resource value: 0x7F090061 public const int fill_vertical = 2131296353; // aapt resource value: 0x7F090062 public const int fingerprint_icon = 2131296354; public const int fill_vertical = 2131296354; // aapt resource value: 0x7F090063 public const int @fixed = 2131296355; public const int fingerprint_icon = 2131296355; // aapt resource value: 0x7F090064 public const int @fixed = 2131296356; // aapt resource value: 0x7F090007 public const int FixedBehind = 2131296263; @@ -3351,221 +3357,221 @@ // aapt resource value: 0x7F090008 public const int FixedFront = 2131296264; // aapt resource value: 0x7F090064 public const int forever = 2131296356; // aapt resource value: 0x7F090065 public const int forever = 2131296357; // aapt resource value: 0x7F090006 public const int FUNCTION = 2131296262; // aapt resource value: 0x7F090065 public const int gd_btn_back = 2131296357; // aapt resource value: 0x7F090066 public const int gd_btn_myLocation = 2131296358; public const int gd_btn_back = 2131296358; // aapt resource value: 0x7F090067 public const int gd_btn_save = 2131296359; public const int gd_btn_myLocation = 2131296359; // aapt resource value: 0x7F090068 public const int gd_img_search_delete = 2131296360; public const int gd_btn_save = 2131296360; // aapt resource value: 0x7F090069 public const int gd_ll_myhome = 2131296361; public const int gd_img_search_delete = 2131296361; // aapt resource value: 0x7F09006A public const int gd_ll_search = 2131296362; public const int gd_ll_myhome = 2131296362; // aapt resource value: 0x7F09006B public const int gd_mapView = 2131296363; public const int gd_ll_search = 2131296363; // aapt resource value: 0x7F09006C public const int gd_rl_topview = 2131296364; public const int gd_mapView = 2131296364; // aapt resource value: 0x7F09006D public const int gd_tv_activity_title = 2131296365; public const int gd_rl_topview = 2131296365; // aapt resource value: 0x7F09006E public const int gd_tv_radius = 2131296366; public const int gd_tv_activity_title = 2131296366; // aapt resource value: 0x7F09006F public const int gd_tv_search_title = 2131296367; public const int gd_tv_radius = 2131296367; // aapt resource value: 0x7F090070 public const int hangup = 2131296368; public const int gd_tv_search_title = 2131296368; // aapt resource value: 0x7F090071 public const int hangupMonitorIn = 2131296369; public const int hangup = 2131296369; // aapt resource value: 0x7F090072 public const int hdl_gallery_rootView = 2131296370; public const int hangupMonitorIn = 2131296370; // aapt resource value: 0x7F090073 public const int hdl_gallery_viewPager = 2131296371; public const int hdl_gallery_rootView = 2131296371; // aapt resource value: 0x7F090074 public const int hdl_options1 = 2131296372; public const int hdl_gallery_viewPager = 2131296372; // aapt resource value: 0x7F090075 public const int hdl_options2 = 2131296373; public const int hdl_options1 = 2131296373; // aapt resource value: 0x7F090076 public const int hdl_options3 = 2131296374; public const int hdl_options2 = 2131296374; // aapt resource value: 0x7F090077 public const int hdl_pickerview_ll = 2131296375; public const int hdl_options3 = 2131296375; // aapt resource value: 0x7F090078 public const int hide = 2131296376; public const int hdl_pickerview_ll = 2131296376; // aapt resource value: 0x7F090079 public const int home = 2131296377; public const int hide = 2131296377; // aapt resource value: 0x7F09007A public const int homeAsUp = 2131296378; public const int home = 2131296378; // aapt resource value: 0x7F09007B public const int hour = 2131296379; public const int homeAsUp = 2131296379; // aapt resource value: 0x7F09007C public const int icon = 2131296380; public const int hour = 2131296380; // aapt resource value: 0x7F09007D public const int icon_back = 2131296381; public const int icon = 2131296381; // aapt resource value: 0x7F09007E public const int icon_group = 2131296382; public const int icon_back = 2131296382; // aapt resource value: 0x7F09007F public const int icon_screenshot = 2131296383; public const int icon_group = 2131296383; // aapt resource value: 0x7F090080 public const int icon_unlock = 2131296384; public const int icon_screenshot = 2131296384; // aapt resource value: 0x7F090081 public const int ifRoom = 2131296385; public const int icon_unlock = 2131296385; // aapt resource value: 0x7F090082 public const int image = 2131296386; public const int ifRoom = 2131296386; // aapt resource value: 0x7F090083 public const int img_call = 2131296387; public const int image = 2131296387; // aapt resource value: 0x7F090084 public const int img_hangup = 2131296388; public const int img_call = 2131296388; // aapt resource value: 0x7F090085 public const int info = 2131296389; public const int img_hangup = 2131296389; // aapt resource value: 0x7F090086 public const int italic = 2131296390; public const int info = 2131296390; // aapt resource value: 0x7F090087 public const int item_touch_helper_previous_elevation = 2131296391; public const int italic = 2131296391; // aapt resource value: 0x7F090088 public const int largeLabel = 2131296392; public const int item_touch_helper_previous_elevation = 2131296392; // aapt resource value: 0x7F090089 public const int left = 2131296393; public const int largeLabel = 2131296393; // aapt resource value: 0x7F09008A public const int line1 = 2131296394; public const int left = 2131296394; // aapt resource value: 0x7F09008B public const int line3 = 2131296395; public const int line1 = 2131296395; // aapt resource value: 0x7F09008C public const int listMode = 2131296396; public const int line3 = 2131296396; // aapt resource value: 0x7F09008D public const int list_item = 2131296397; public const int listMode = 2131296397; // aapt resource value: 0x7F09008E public const int localDoorUnlock = 2131296398; public const int list_item = 2131296398; // aapt resource value: 0x7F09008F public const int localVideo = 2131296399; public const int localDoorUnlock = 2131296399; // aapt resource value: 0x7F090090 public const int masked = 2131296400; public const int localVideo = 2131296400; // aapt resource value: 0x7F090091 public const int masked = 2131296401; // aapt resource value: 0x7F09000A public const int MatchLayout = 2131296266; // aapt resource value: 0x7F090091 public const int media_actions = 2131296401; // aapt resource value: 0x7F090092 public const int message = 2131296402; public const int media_actions = 2131296402; // aapt resource value: 0x7F090093 public const int message = 2131296403; // aapt resource value: 0x7F090009 public const int META = 2131296265; // aapt resource value: 0x7F090093 public const int middle = 2131296403; // aapt resource value: 0x7F090094 public const int min = 2131296404; public const int middle = 2131296404; // aapt resource value: 0x7F090095 public const int mini = 2131296405; public const int min = 2131296405; // aapt resource value: 0x7F090096 public const int monitor = 2131296406; public const int mini = 2131296406; // aapt resource value: 0x7F090097 public const int month = 2131296407; public const int monitor = 2131296407; // aapt resource value: 0x7F090098 public const int multiply = 2131296408; public const int month = 2131296408; // aapt resource value: 0x7F090099 public const int myButton = 2131296409; public const int multiply = 2131296409; // aapt resource value: 0x7F09009A public const int navigation_header_container = 2131296410; public const int myButton = 2131296410; // aapt resource value: 0x7F09009B public const int never = 2131296411; public const int navigation_header_container = 2131296411; // aapt resource value: 0x7F09009C public const int none = 2131296412; public const int never = 2131296412; // aapt resource value: 0x7F09009D public const int normal = 2131296413; public const int none = 2131296413; // aapt resource value: 0x7F09009E public const int normal = 2131296414; // aapt resource value: 0x7F09000B public const int Notice = 2131296267; // aapt resource value: 0x7F09009E public const int notification_background = 2131296414; // aapt resource value: 0x7F09009F public const int notification_main_column = 2131296415; public const int notification_background = 2131296415; // aapt resource value: 0x7F0900A0 public const int notification_main_column_container = 2131296416; public const int notification_main_column = 2131296416; // aapt resource value: 0x7F0900A1 public const int options1 = 2131296417; public const int notification_main_column_container = 2131296417; // aapt resource value: 0x7F0900A2 public const int options2 = 2131296418; public const int options1 = 2131296418; // aapt resource value: 0x7F0900A3 public const int options3 = 2131296419; public const int options2 = 2131296419; // aapt resource value: 0x7F0900A4 public const int optionspicker = 2131296420; public const int options3 = 2131296420; // aapt resource value: 0x7F0900A5 public const int outmost_container = 2131296421; public const int optionspicker = 2131296421; // aapt resource value: 0x7F0900A6 public const int parallax = 2131296422; public const int outmost_container = 2131296422; // aapt resource value: 0x7F0900A7 public const int parentPanel = 2131296423; public const int parallax = 2131296423; // aapt resource value: 0x7F0900A8 public const int parentPanel = 2131296424; // aapt resource value: 0x7F09000C public const int Password = 2131296268; @@ -3573,200 +3579,200 @@ // aapt resource value: 0x7F09000D public const int PasswordLabel = 2131296269; // aapt resource value: 0x7F0900A8 public const int peerAddress = 2131296424; // aapt resource value: 0x7F0900A9 public const int pin = 2131296425; public const int peerAddress = 2131296425; // aapt resource value: 0x7F0900AA public const int progress_circular = 2131296426; public const int pin = 2131296426; // aapt resource value: 0x7F0900AB public const int progress_horizontal = 2131296427; public const int progress_circular = 2131296427; // aapt resource value: 0x7F0900AC public const int radio = 2131296428; public const int progress_horizontal = 2131296428; // aapt resource value: 0x7F0900AD public const int remoteFrame = 2131296429; public const int radio = 2131296429; // aapt resource value: 0x7F0900AE public const int remoteFrameContainer = 2131296430; public const int remoteFrame = 2131296430; // aapt resource value: 0x7F0900AF public const int remoteVideo = 2131296431; public const int remoteFrameContainer = 2131296431; // aapt resource value: 0x7F0900B0 public const int requestA = 2131296432; public const int remoteVideo = 2131296432; // aapt resource value: 0x7F0900B1 public const int requestMasterAudio = 2131296433; public const int requestA = 2131296433; // aapt resource value: 0x7F0900B2 public const int requestMasterVideo = 2131296434; public const int requestMasterAudio = 2131296434; // aapt resource value: 0x7F0900B3 public const int requestV = 2131296435; public const int requestMasterVideo = 2131296435; // aapt resource value: 0x7F0900B4 public const int reverseCall = 2131296436; public const int requestV = 2131296436; // aapt resource value: 0x7F0900B5 public const int reverseCallInfo = 2131296437; public const int reverseCall = 2131296437; // aapt resource value: 0x7F0900B6 public const int right = 2131296438; public const int reverseCallInfo = 2131296438; // aapt resource value: 0x7F0900B7 public const int right_icon = 2131296439; public const int right = 2131296439; // aapt resource value: 0x7F0900B8 public const int right_side = 2131296440; public const int right_icon = 2131296440; // aapt resource value: 0x7F0900B9 public const int rl_call = 2131296441; public const int right_side = 2131296441; // aapt resource value: 0x7F0900BA public const int rl_hangup = 2131296442; public const int rl_call = 2131296442; // aapt resource value: 0x7F0900BB public const int rl_sceenshot = 2131296443; public const int rl_hangup = 2131296443; // aapt resource value: 0x7F0900BC public const int rl_unlock = 2131296444; public const int rl_sceenshot = 2131296444; // aapt resource value: 0x7F0900BD public const int rv_topbar = 2131296445; public const int rl_unlock = 2131296445; // aapt resource value: 0x7F0900BE public const int rv_topbar = 2131296446; // aapt resource value: 0x7F090013 public const int Scale = 2131296275; // aapt resource value: 0x7F0900BE public const int screen = 2131296446; // aapt resource value: 0x7F0900BF public const int scroll = 2131296447; // aapt resource value: 0x7F0900C3 public const int scrollable = 2131296451; public const int screen = 2131296447; // aapt resource value: 0x7F0900C0 public const int scrollIndicatorDown = 2131296448; // aapt resource value: 0x7F0900C1 public const int scrollIndicatorUp = 2131296449; // aapt resource value: 0x7F0900C2 public const int scrollView = 2131296450; public const int scroll = 2131296448; // aapt resource value: 0x7F0900C4 public const int search_badge = 2131296452; public const int scrollable = 2131296452; // aapt resource value: 0x7F0900C1 public const int scrollIndicatorDown = 2131296449; // aapt resource value: 0x7F0900C2 public const int scrollIndicatorUp = 2131296450; // aapt resource value: 0x7F0900C3 public const int scrollView = 2131296451; // aapt resource value: 0x7F0900C5 public const int search_bar = 2131296453; public const int search_badge = 2131296453; // aapt resource value: 0x7F0900C6 public const int search_button = 2131296454; public const int search_bar = 2131296454; // aapt resource value: 0x7F0900C7 public const int search_close_btn = 2131296455; public const int search_button = 2131296455; // aapt resource value: 0x7F0900C8 public const int search_edit_frame = 2131296456; public const int search_close_btn = 2131296456; // aapt resource value: 0x7F0900C9 public const int search_go_btn = 2131296457; public const int search_edit_frame = 2131296457; // aapt resource value: 0x7F0900CA public const int search_mag_icon = 2131296458; public const int search_go_btn = 2131296458; // aapt resource value: 0x7F0900CB public const int search_plate = 2131296459; public const int search_mag_icon = 2131296459; // aapt resource value: 0x7F0900CC public const int search_src_text = 2131296460; public const int search_plate = 2131296460; // aapt resource value: 0x7F0900CD public const int search_voice_btn = 2131296461; public const int search_src_text = 2131296461; // aapt resource value: 0x7F0900CE public const int second = 2131296462; public const int search_voice_btn = 2131296462; // aapt resource value: 0x7F0900CF public const int select_dialog_listview = 2131296463; public const int second = 2131296463; // aapt resource value: 0x7F0900D0 public const int sendA = 2131296464; public const int select_dialog_listview = 2131296464; // aapt resource value: 0x7F0900D1 public const int sendCustomData = 2131296465; public const int sendA = 2131296465; // aapt resource value: 0x7F0900D2 public const int sendV = 2131296466; public const int sendCustomData = 2131296466; // aapt resource value: 0x7F0900D3 public const int sendV = 2131296467; // aapt resource value: 0x7F09000E public const int SHIFT = 2131296270; // aapt resource value: 0x7F0900D3 public const int shortcut = 2131296467; // aapt resource value: 0x7F0900D4 public const int show = 2131296468; public const int shortcut = 2131296468; // aapt resource value: 0x7F0900D5 public const int showCustom = 2131296469; public const int show = 2131296469; // aapt resource value: 0x7F0900D6 public const int showHome = 2131296470; public const int showCustom = 2131296470; // aapt resource value: 0x7F0900D7 public const int showTitle = 2131296471; public const int showHome = 2131296471; // aapt resource value: 0x7F0900D8 public const int smallLabel = 2131296472; public const int showTitle = 2131296472; // aapt resource value: 0x7F0900D9 public const int snackbar_action = 2131296473; public const int smallLabel = 2131296473; // aapt resource value: 0x7F0900DA public const int snackbar_text = 2131296474; public const int snackbar_action = 2131296474; // aapt resource value: 0x7F0900DB public const int snap = 2131296475; public const int snackbar_text = 2131296475; // aapt resource value: 0x7F0900DC public const int snapshot = 2131296476; public const int snap = 2131296476; // aapt resource value: 0x7F0900DD public const int spacer = 2131296477; public const int snapshot = 2131296477; // aapt resource value: 0x7F0900DE public const int split_action_bar = 2131296478; public const int spacer = 2131296478; // aapt resource value: 0x7F0900DF public const int src_atop = 2131296479; public const int split_action_bar = 2131296479; // aapt resource value: 0x7F0900E0 public const int src_in = 2131296480; public const int src_atop = 2131296480; // aapt resource value: 0x7F0900E1 public const int src_over = 2131296481; public const int src_in = 2131296481; // aapt resource value: 0x7F0900E2 public const int srl_classics_arrow = 2131296482; public const int src_over = 2131296482; // aapt resource value: 0x7F0900E3 public const int srl_classics_center = 2131296483; public const int srl_classics_arrow = 2131296483; // aapt resource value: 0x7F0900E4 public const int srl_classics_progress = 2131296484; public const int srl_classics_center = 2131296484; // aapt resource value: 0x7F0900E5 public const int srl_classics_title = 2131296485; public const int srl_classics_progress = 2131296485; // aapt resource value: 0x7F0900E6 public const int srl_classics_update = 2131296486; public const int srl_classics_title = 2131296486; // aapt resource value: 0x7F0900E7 public const int srl_classics_update = 2131296487; // aapt resource value: 0x7F09000F public const int SSID = 2131296271; @@ -3774,218 +3780,218 @@ // aapt resource value: 0x7F090010 public const int SSIDLabel = 2131296272; // aapt resource value: 0x7F0900E7 public const int start = 2131296487; // aapt resource value: 0x7F0900E8 public const int startAVMsg = 2131296488; public const int start = 2131296488; // aapt resource value: 0x7F0900E9 public const int startDoorKey = 2131296489; public const int startAVMsg = 2131296489; // aapt resource value: 0x7F0900EA public const int startLocalRecord = 2131296490; public const int startDoorKey = 2131296490; // aapt resource value: 0x7F0900EB public const int startReadCard = 2131296491; public const int startLocalRecord = 2131296491; // aapt resource value: 0x7F0900EC public const int startRecord = 2131296492; public const int startReadCard = 2131296492; // aapt resource value: 0x7F0900ED public const int startRecordLocalAudio = 2131296493; public const int startRecord = 2131296493; // aapt resource value: 0x7F0900EE public const int startRecordPeerAudio = 2131296494; public const int startRecordLocalAudio = 2131296494; // aapt resource value: 0x7F0900EF public const int startStream = 2131296495; public const int startRecordPeerAudio = 2131296495; // aapt resource value: 0x7F0900F0 public const int startV1 = 2131296496; public const int startStream = 2131296496; // aapt resource value: 0x7F0900F1 public const int startV1V4 = 2131296497; public const int startV1 = 2131296497; // aapt resource value: 0x7F0900F2 public const int startV4 = 2131296498; public const int startV1V4 = 2131296498; // aapt resource value: 0x7F0900F3 public const int start_stop = 2131296499; public const int startV4 = 2131296499; // aapt resource value: 0x7F0900F4 public const int start_stop_stream = 2131296500; public const int start_stop = 2131296500; // aapt resource value: 0x7F0900F5 public const int status = 2131296501; public const int start_stop_stream = 2131296501; // aapt resource value: 0x7F0900F6 public const int status_bar_latest_event_content = 2131296502; public const int status = 2131296502; // aapt resource value: 0x7F0900F7 public const int stop = 2131296503; public const int status_bar_latest_event_content = 2131296503; // aapt resource value: 0x7F0900F8 public const int stopAVMsg = 2131296504; public const int stop = 2131296504; // aapt resource value: 0x7F0900F9 public const int stopDoorKey = 2131296505; public const int stopAVMsg = 2131296505; // aapt resource value: 0x7F0900FA public const int stopLocalRecord = 2131296506; public const int stopDoorKey = 2131296506; // aapt resource value: 0x7F0900FB public const int stopReadCard = 2131296507; public const int stopLocalRecord = 2131296507; // aapt resource value: 0x7F0900FC public const int stopRecord = 2131296508; public const int stopReadCard = 2131296508; // aapt resource value: 0x7F0900FD public const int stopRecordLocalAudio = 2131296509; public const int stopRecord = 2131296509; // aapt resource value: 0x7F0900FE public const int stopRecordPeerAudio = 2131296510; public const int stopRecordLocalAudio = 2131296510; // aapt resource value: 0x7F0900FF public const int stopStream = 2131296511; public const int stopRecordPeerAudio = 2131296511; // aapt resource value: 0x7F090100 public const int stopStream = 2131296512; // aapt resource value: 0x7F090011 public const int STROKE = 2131296273; // aapt resource value: 0x7F090100 public const int submenuarrow = 2131296512; // aapt resource value: 0x7F090101 public const int submit_area = 2131296513; public const int submenuarrow = 2131296513; // aapt resource value: 0x7F090102 public const int subtitle = 2131296514; public const int submit_area = 2131296514; // aapt resource value: 0x7F090103 public const int subtitle = 2131296515; // aapt resource value: 0x7F090012 public const int SYM = 2131296274; // aapt resource value: 0x7F090103 public const int tabMode = 2131296515; // aapt resource value: 0x7F090104 public const int text = 2131296516; public const int tabMode = 2131296516; // aapt resource value: 0x7F090105 public const int text2 = 2131296517; // aapt resource value: 0x7F090109 public const int textinput_counter = 2131296521; // aapt resource value: 0x7F09010A public const int textinput_error = 2131296522; public const int text = 2131296517; // aapt resource value: 0x7F090106 public const int textSpacerNoButtons = 2131296518; public const int text2 = 2131296518; // aapt resource value: 0x7F090107 public const int textSpacerNoTitle = 2131296519; // aapt resource value: 0x7F090108 public const int text_input_password_toggle = 2131296520; // aapt resource value: 0x7F09010A public const int textinput_counter = 2131296522; // aapt resource value: 0x7F09010B public const int time = 2131296523; public const int textinput_error = 2131296523; // aapt resource value: 0x7F090107 public const int textSpacerNoButtons = 2131296519; // aapt resource value: 0x7F090108 public const int textSpacerNoTitle = 2131296520; // aapt resource value: 0x7F090109 public const int text_input_password_toggle = 2131296521; // aapt resource value: 0x7F09010C public const int timepicker = 2131296524; public const int time = 2131296524; // aapt resource value: 0x7F09010D public const int title = 2131296525; public const int timepicker = 2131296525; // aapt resource value: 0x7F09010E public const int titleDividerNoCustom = 2131296526; public const int title = 2131296526; // aapt resource value: 0x7F09010F public const int title_template = 2131296527; public const int titleDividerNoCustom = 2131296527; // aapt resource value: 0x7F090110 public const int top = 2131296528; public const int title_template = 2131296528; // aapt resource value: 0x7F090111 public const int topPanel = 2131296529; public const int top = 2131296529; // aapt resource value: 0x7F090112 public const int touch_outside = 2131296530; public const int topPanel = 2131296530; // aapt resource value: 0x7F090113 public const int touch_outside = 2131296531; // aapt resource value: 0x7F090014 public const int Translate = 2131296276; // aapt resource value: 0x7F090113 public const int tvTitle = 2131296531; // aapt resource value: 0x7F090114 public const int tv_call = 2131296532; public const int tvTitle = 2131296532; // aapt resource value: 0x7F090115 public const int tv_content = 2131296533; public const int tv_call = 2131296533; // aapt resource value: 0x7F090116 public const int tv_hangup = 2131296534; public const int tv_content = 2131296534; // aapt resource value: 0x7F090117 public const int tv_name = 2131296535; public const int tv_hangup = 2131296535; // aapt resource value: 0x7F090118 public const int tv_ok = 2131296536; public const int tv_name = 2131296536; // aapt resource value: 0x7F090119 public const int tv_roomName = 2131296537; public const int tv_ok = 2131296537; // aapt resource value: 0x7F09011A public const int tv_screenshot = 2131296538; public const int tv_roomName = 2131296538; // aapt resource value: 0x7F09011B public const int tv_tip = 2131296539; public const int tv_screenshot = 2131296539; // aapt resource value: 0x7F09011C public const int tv_title = 2131296540; public const int tv_tip = 2131296540; // aapt resource value: 0x7F09011D public const int tv_unlock = 2131296541; public const int tv_title = 2131296541; // aapt resource value: 0x7F09011E public const int tv_zxing_back = 2131296542; public const int tv_unlock = 2131296542; // aapt resource value: 0x7F09011F public const int tv_zxing_flash = 2131296543; public const int tv_zxing_back = 2131296543; // aapt resource value: 0x7F090120 public const int tv_zxing_scan = 2131296544; public const int tv_zxing_flash = 2131296544; // aapt resource value: 0x7F090121 public const int uniform = 2131296545; public const int tv_zxing_scan = 2131296545; // aapt resource value: 0x7F090122 public const int up = 2131296546; public const int uniform = 2131296546; // aapt resource value: 0x7F090123 public const int useLogo = 2131296547; public const int up = 2131296547; // aapt resource value: 0x7F090124 public const int uvc = 2131296548; public const int useLogo = 2131296548; // aapt resource value: 0x7F090125 public const int videoParent = 2131296549; public const int uvc = 2131296549; // aapt resource value: 0x7F090126 public const int view_offset_helper = 2131296550; public const int videoParent = 2131296550; // aapt resource value: 0x7F090127 public const int visible = 2131296551; public const int view_offset_helper = 2131296551; // aapt resource value: 0x7F090128 public const int withText = 2131296552; public const int visible = 2131296552; // aapt resource value: 0x7F090129 public const int wrap_content = 2131296553; public const int withText = 2131296553; // aapt resource value: 0x7F09012A public const int year = 2131296554; public const int wrap_content = 2131296554; // aapt resource value: 0x7F09012B public const int year = 2131296555; static Id() { @@ -4295,6 +4301,12 @@ // aapt resource value: 0x7F0B0052 public const int video_device = 2131427410; // aapt resource value: 0x7F0B0054 public const int zxingscanneractivitylayout = 2131427412; // aapt resource value: 0x7F0B0055 public const int zxingscannerfragmentlayout = 2131427413; // aapt resource value: 0x7F0B0053 public const int zxing_layout = 2131427411; old mode 100644 new mode 100755
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-2.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-2.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152_152.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167_167.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20_20.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29_29.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-2.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-2.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/512_512-1.png
Binary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-2.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60_60.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76_76.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-2.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87-1.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87.pngZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.jsonold mode 100755 new mode 100644
@@ -1,121 +1,121 @@ { "images": [ { "filename": "40*40.png", "filename": "40_40.png", "size": "20x20", "scale": "2x", "idiom": "iphone" }, { "filename": "60*60.png", "filename": "60_60.png", "size": "20x20", "scale": "3x", "idiom": "iphone" }, { "filename": "58*58.png", "filename": "58_58.png", "size": "29x29", "scale": "2x", "idiom": "iphone" }, { "filename": "87*87.png", "filename": "87_87.png", "size": "29x29", "scale": "3x", "idiom": "iphone" }, { "filename": "80*80.png", "filename": "80_80.png", "size": "40x40", "scale": "2x", "idiom": "iphone" }, { "filename": "120*120.png", "filename": "120_120.png", "size": "40x40", "scale": "3x", "idiom": "iphone" }, { "filename": "120*120-1.png", "filename": "120_120-1.png", "size": "60x60", "scale": "2x", "idiom": "iphone" }, { "filename": "180*180.png", "filename": "180_180.png", "size": "60x60", "scale": "3x", "idiom": "iphone" }, { "filename": "20*20.png", "filename": "20_20.png", "size": "20x20", "scale": "1x", "idiom": "ipad" }, { "filename": "40*40-1.png", "filename": "40_40-1.png", "size": "20x20", "scale": "2x", "idiom": "ipad" }, { "filename": "29*29.png", "filename": "29_29.png", "size": "29x29", "scale": "1x", "idiom": "ipad" }, { "filename": "58*58-1.png", "filename": "58_58-1.png", "size": "29x29", "scale": "2x", "idiom": "ipad" }, { "filename": "40*40-2.png", "filename": "40_40-2.png", "size": "40x40", "scale": "1x", "idiom": "ipad" }, { "filename": "80*80-1.png", "filename": "80_80-1.png", "size": "40x40", "scale": "2x", "idiom": "ipad" }, { "filename": "167*167.png", "filename": "167_167.png", "size": "83.5x83.5", "scale": "2x", "idiom": "ipad" }, { "filename": "76*76.png", "filename": "76_76.png", "size": "76x76", "scale": "1x", "idiom": "ipad" }, { "filename": "152*152.png", "filename": "152_152.png", "size": "76x76", "scale": "2x", "idiom": "ipad" }, { "filename": "1024*1024.png", "filename": "1024_1024.png", "size": "1024x1024", "scale": "1x", "idiom": "ios-marketing" }, { "filename": "120*120-2.png", "filename": "120_120-2.png", "size": "60x60", "scale": "2x", "idiom": "car" }, { "filename": "180*180-1.png", "filename": "180_180-1.png", "size": "60x60", "scale": "3x", "idiom": "car" @@ -136,21 +136,21 @@ }, { "role": "companionSettings", "filename": "58*58-2.png", "filename": "58_58-2.png", "size": "29x29", "scale": "2x", "idiom": "watch" }, { "role": "companionSettings", "filename": "87*87-1.png", "filename": "87_87-1.png", "size": "29x29", "scale": "3x", "idiom": "watch" }, { "role": "appLauncher", "filename": "80*80-2.png", "filename": "80_80-2.png", "size": "40x40", "subtype": "38mm", "scale": "2x", @@ -192,7 +192,7 @@ "idiom": "watch" }, { "filename": "1024*1024-1.png", "filename": "1024_1024-1.png", "size": "1024x1024", "scale": "1x", "idiom": "watch-marketing" @@ -233,16 +233,19 @@ "idiom": "mac" }, { "filename": "512_512.png", "size": "256x256", "scale": "2x", "idiom": "mac" }, { "filename": "512_512-1.png", "size": "512x512", "scale": "1x", "idiom": "mac" }, { "filename": "1024_1024-2.png", "size": "512x512", "scale": "2x", "idiom": "mac" ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920X1080.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840X2160.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-1.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792.pngZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.jsonold mode 100755 new mode 100644
@@ -3,6 +3,7 @@ { "orientation": "landscape", "extent": "full-screen", "filename": "1920_1080-1.png", "size": "1920x1080", "scale": "1x", "idiom": "tv", @@ -11,6 +12,7 @@ { "orientation": "landscape", "extent": "full-screen", "filename": "3840_2160-1.png", "size": "1920x1080", "scale": "2x", "idiom": "tv", @@ -20,7 +22,7 @@ "minimum-system-version": "12.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧1242*2688.png", "filename": "1242_2688.png", "size": "414x896", "subtype": "1792", "scale": "3x", @@ -30,7 +32,7 @@ "minimum-system-version": "12.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧828*1792.png", "filename": "828_1792.png", "size": "276x597.3", "subtype": "2688", "scale": "3x", @@ -40,7 +42,7 @@ "minimum-system-version": "12.0", "orientation": "landscape", "extent": "full-screen", "filename": "æ欧2688*1242.png", "filename": "2688_1242.png", "size": "896x414", "subtype": "1792", "scale": "3x", @@ -50,7 +52,7 @@ "minimum-system-version": "12.0", "orientation": "landscape", "extent": "full-screen", "filename": "æ欧1792*828.png", "filename": "1792_828.png", "size": "597.3x276", "subtype": "2688", "scale": "3x", @@ -60,7 +62,7 @@ "minimum-system-version": "11.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧1125*2436.png", "filename": "1125_2436.png", "size": "375x812", "subtype": "2436h", "scale": "3x", @@ -70,7 +72,7 @@ "minimum-system-version": "11.0", "orientation": "landscape", "extent": "full-screen", "filename": "æ欧2436*1125.png", "filename": "2436_1125.png", "size": "812x375", "subtype": "2436h", "scale": "3x", @@ -80,7 +82,7 @@ "minimum-system-version": "8.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧1242*2208.png", "filename": "1242_2208.png", "size": "414x736", "subtype": "736h", "scale": "3x", @@ -90,7 +92,7 @@ "minimum-system-version": "8.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧750_1334å¤ä»½.png", "filename": "750_1334.png", "size": "375x667", "subtype": "667h", "scale": "2x", @@ -100,7 +102,7 @@ "minimum-system-version": "8.0", "orientation": "landscape", "extent": "full-screen", "filename": "æ欧2208*1242.png", "filename": "2208_1242.png", "size": "736x414", "subtype": "736h", "scale": "3x", @@ -110,7 +112,7 @@ "minimum-system-version": "7.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧2048*2732.png", "filename": "2048_2732.png", "size": "1024x1366", "scale": "2x", "idiom": "ipad" @@ -119,7 +121,7 @@ "minimum-system-version": "7.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧640_960å¤ä»½.png", "filename": "640_960.png", "size": "320x480", "scale": "2x", "idiom": "iphone" @@ -128,7 +130,7 @@ "minimum-system-version": "7.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧640_1136å¤ä»½.png", "filename": "640_1136.png", "size": "320x568", "subtype": "retina4", "scale": "2x", @@ -138,7 +140,7 @@ "minimum-system-version": "7.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧768*1024.png", "filename": "768_1024.png", "size": "768x1024", "scale": "1x", "idiom": "ipad" @@ -147,7 +149,7 @@ "minimum-system-version": "7.0", "orientation": "portrait", "extent": "full-screen", "filename": "æ欧1536*2048.png", "filename": "1536_2048.png", "size": "768x1024", "scale": "2x", "idiom": "ipad" @@ -156,7 +158,7 @@ "minimum-system-version": "7.0", "orientation": "landscape", "extent": "full-screen", "filename": "æ欧1024*768.png", "filename": "1024_768.png", "size": "1024x768", "scale": "1x", "idiom": "ipad" @@ -165,7 +167,7 @@ "minimum-system-version": "7.0", "orientation": "landscape", "extent": "full-screen", "filename": "æ欧2048*1536.png", "filename": "2048_1536.png", "size": "1024x768", "scale": "2x", "idiom": "ipad" @@ -173,7 +175,7 @@ { "orientation": "portrait", "extent": "full-screen", "filename": "æ欧320_480å¤ä»½.png", "filename": "320_480.png", "size": "320x480", "scale": "1x", "idiom": "iphone" @@ -181,7 +183,7 @@ { "orientation": "portrait", "extent": "full-screen", "filename": "æ欧640_960å¤ä»½-1.png", "filename": "640_960-1.png", "size": "320x480", "scale": "2x", "idiom": "iphone" @@ -189,7 +191,7 @@ { "orientation": "portrait", "extent": "full-screen", "filename": "æ欧640_1136å¤ä»½-1.png", "filename": "640_1136-1.png", "size": "320x568", "subtype": "retina4", "scale": "2x", @@ -198,7 +200,7 @@ { "orientation": "portrait", "extent": "to-status-bar", "filename": "æ欧768_1004å¤ä»½.png", "filename": "768_1004.png", "size": "768x1004", "scale": "1x", "idiom": "ipad" @@ -206,7 +208,7 @@ { "orientation": "portrait", "extent": "to-status-bar", "filename": "æ欧1536_2008å¤ä»½.png", "filename": "1536_2008.png", "size": "768x1004", "scale": "2x", "idiom": "ipad" @@ -214,7 +216,7 @@ { "orientation": "portrait", "extent": "full-screen", "filename": "æ欧768_1024å¤ä»½.png", "filename": "768_1024-1.png", "size": "768x1024", "scale": "1x", "idiom": "ipad" @@ -222,7 +224,7 @@ { "orientation": "portrait", "extent": "full-screen", "filename": "æ欧1536_2048å¤ä»½.png", "filename": "1536_2048-1.png", "size": "768x1024", "scale": "2x", "idiom": "ipad" @@ -230,7 +232,7 @@ { "orientation": "landscape", "extent": "to-status-bar", "filename": "æ欧1024_748å¤ä»½.png", "filename": "1024_748.png", "size": "1024x748", "scale": "1x", "idiom": "ipad" @@ -238,7 +240,7 @@ { "orientation": "landscape", "extent": "to-status-bar", "filename": "æ欧2048_1496å¤ä»½.png", "filename": "2048_1496.png", "size": "1024x748", "scale": "2x", "idiom": "ipad" @@ -246,7 +248,7 @@ { "orientation": "landscape", "extent": "full-screen", "filename": "æ欧1024_768å¤ä»½.png", "filename": "1024_768-1.png", "size": "1024x768", "scale": "1x", "idiom": "ipad" @@ -254,7 +256,7 @@ { "orientation": "landscape", "extent": "full-screen", "filename": "æ欧2048_1536å¤ä»½.png", "filename": "2048_1536-1.png", "size": "1024x768", "scale": "2x", "idiom": "ipad" ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1024*768.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1024_748±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1024_768±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1125*2436.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1536*2048.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1536_2008±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1536_2048±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·1792*828.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·2048*1536.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·2048_1496±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·2048_1536±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·2208*1242.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·2436*1125.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·2688*1242.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·320_480±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·640_1136±¸·Ý-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·640_1136±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·640_960±¸·Ý-1.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·640_960±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·750_1334±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·768*1024.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·768_1004±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Ò×Å·768_1024±¸·Ý.pngBinary files differ
ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -119,6 +119,7 @@ </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> <Folder Include="Resources\Phone\RoomIcon\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -152,112 +153,66 @@ </ProjectReference> </ItemGroup> <ItemGroup> <ImageAsset Include="Assets.xcassets\.DS_Store" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688_XS Max.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792_XR.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*2732-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1004.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2008.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*748.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1496.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1242*2688.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧828*1792.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2688*1242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1792*828.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1125*2436.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2436*1125.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1242*2208.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2208*1242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2048*2732.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧768*1024.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1536*2048.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1024*768.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2048*1536.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧750_1334å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧640_960å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧640_1136å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧320_480å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧640_960å¤ä»½-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧640_1136å¤ä»½-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧768_1004å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1536_2008å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧768_1024å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1536_2048å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1024_748å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2048_1496å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧1024_768å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\æ欧2048_1536å¤ä»½.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\512_512.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\512_512-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" /> </ItemGroup> <ItemGroup> <BundleResource Include="Resources\Language.ini" /> @@ -991,28 +946,6 @@ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_1.png" /> <BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_3.png" /> <BundleResource Include="Resources\Phone\Floor\Floor.png" /> <BundleResource Include="Resources\Phone\RoomIcon\8.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\0.jpg" /> <BundleResource Include="Resources\Phone\Account\Logo_WhiteHome.png" /> <BundleResource Include="Resources\Phone\Account\Code.png" /> <BundleResource Include="Resources\Phone\Account\Cancle.png" /> @@ -1166,6 +1099,28 @@ <BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" /> <BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" /> <BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" /> <BundleResource Include="Resources\Phone\RoomIcon\0.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\8.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" /> <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" /> </ItemGroup> <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> ZigbeeApp/Home.Ios/MainViewController.csold mode 100644 new mode 100755
ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png.pngBinary files differ
ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png.pngBinary files differ
ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
File was deleted ZigbeeApp/Home.Ios/mono_crash.115869ea88.1.json
File was deleted ZigbeeApp/ShardLib/Additions/AboutAdditions.txtold mode 100644 new mode 100755
ZigbeeApp/ShardLib/Jars/AboutJars.txtold mode 100644 new mode 100755
ZigbeeApp/ShardLib/Properties/AssemblyInfo.csold mode 100644 new mode 100755
ZigbeeApp/ShardLib/ShardLib.csprojold mode 100644 new mode 100755
@@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -8,7 +8,7 @@ <OutputType>Library</OutputType> <RootNamespace>ShardLib</RootNamespace> <AssemblyName>ShardLib</AssemblyName> <TargetFrameworkVersion>v9.0</TargetFrameworkVersion> <TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <AndroidClassParser>class-parse</AndroidClassParser> ZigbeeApp/ShardLib/Transforms/EnumFields.xmlold mode 100644 new mode 100755
ZigbeeApp/ShardLib/Transforms/EnumMethods.xmlold mode 100644 new mode 100755
ZigbeeApp/ShardLib/Transforms/Metadata.xmlold mode 100644 new mode 100755
ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,7 +42,7 @@ /// <summary> /// çæ¬å· /// </summary> public static string CodeIDString = "1.1.0120091701"; public static string CodeIDString = "1.1.0120092101"; /// <summary> /// 注åæ¥æº(0:HDL On 1:Zigbee) /// </summary> ZigbeeApp/Shared/Common/Device.cs
@@ -107,9 +107,16 @@ { CommonDevice device = null; //ååºåå为æå®çç±»ï¼ä¸ç¶æ°æ®ä¼ä¸¢å¤±è导è´æ æ³å¼ºè½¬ try try { device = CommonDevice.CommonDeviceByFilePath(file); //读åå®çå 容 var fileData = HdlFileLogic.Current.ReadFileTextContent(System.IO.Path.Combine(Config.Instance.FullPath, file)); var jobject = Newtonsoft.Json.Linq.JObject.Parse(fileData); if (jobject.Property("DeviceID") == null) { continue; } device = CommonDevice.CommonDeviceByByteString(Convert.ToInt32(jobject["DeviceID"].ToString()), fileData); } catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); } @@ -152,11 +159,28 @@ } this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint); //对åºæ§çæ¬ç设å¤æ件 Device_OnoffOutput_abcdfrtgg_01 bool bolSave = file.Split(new string[] { "_" }, StringSplitOptions.None).Length == 4; if (bolSave == true) { //å æè¿ä¸ªæ件,éæ°çæ HdlAutoBackupLogic.DeleteFile(file); Global.DeleteFilebyHomeId(file); } //æ£æµUiå¾çæ¯å¦æ£ç¡®,è¿ä¸ªå¾çæ¬å°æ¯å¦åå¨ï¼ if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(device.IconPath)) == true) { //ä¸åå¨çè¯ï¼éæ°çæ device.IconPath = string.Empty; device.ReSave(); HdlAutoBackupLogic.AddOrEditorFile(device.FilePath); bolSave = false; } //éæ°çææ件 if (bolSave == true) { device.ReSave(); HdlAutoBackupLogic.AddOrEditorFile(device.FilePath); } @@ -227,7 +251,7 @@ { strMsg = itemName + "没æå®è£ (1)"; } device = CommonDevice.CommonDeviceByByteString(itemName, "{}"); device = CommonDevice.CommonDeviceByByteString(itemValue, "{}"); if (device == null) { strMsg += "\r\n" + itemName + "没æå®è£ (2)"; @@ -2600,9 +2624,14 @@ //æ°é£çæ¹¿åº¦ä¼ æå¨ä¸æ¾ç¤º return false; } if (((int)i_device.Type).ToString() == i_device.Type.ToString()) { //æ¤è®¾å¤idå¨DeviceTypeéé¢è¿æ²¡æ注å,åä¸è½æ¾ç¤ºåºæ¥ return false; } //å¦ææ¯æ°é£é¢æ¿æç¯å¢é¢æ¿,åé½ä¸æ¾ç¤ºä»»ä½åè·¯ var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device }); var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device }); if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir || myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment) { return false; @@ -2960,7 +2989,7 @@ return false; } //æ ¹æ®æ°Typeéæ°New对象 var newDevice = CommonDevice.CommonDeviceByByteString(newDeviceType.ToString(), deviceData); var newDevice = CommonDevice.CommonDeviceByByteString((int)newDeviceType, deviceData); if (newDevice == null) { //好åæç¹å¯è½ @@ -3089,32 +3118,12 @@ /// <returns></returns> public CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType) { CommonDevice device = null; //æ ¹æ®è®¾å¤ç±»åå建设å¤å¯¹è±¡çå®ä¾ if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); } else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); } else if (deviceType == DeviceType.ColorDimmerSwitch) { device = new ColorDimmerSwitch(); } else if (deviceType == DeviceType.LevelControlSwitch) { device = new LevelControlSwitch(); } else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); } else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); } else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); } else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); } else if (deviceType == DeviceType.WindowCoveringController) { device = new WindowCoveringController(); } else if (deviceType == DeviceType.IASZone) { device = new IASZone(); } else if (deviceType == DeviceType.Repeater) { device = new Repeater(); } else if (deviceType == DeviceType.Thermostat) { device = new AC(); } else if (deviceType == DeviceType.FreshAir) { device = new FreshAir(); } else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); } else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); } else if (deviceType == DeviceType.PMSensor) { device = new PMSensor(); } else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); } else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); } else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); } else if (deviceType == DeviceType.Transverter) { device = new Transverter(); } else if (deviceType == DeviceType.DimmerSwitch) { device = new DimmerSwitch(); } else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); } else { return null; } var device = CommonDevice.CommonDeviceByByteString((int)deviceType, "{\"DeviceID\":" + (int)deviceType + "}"); if (device == null) { return null; } device.DeviceEpointName = string.Empty; device.DeviceName = string.Empty; ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.csold mode 100644 new mode 100755
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDeviceChange.csold mode 100644 new mode 100755
@@ -179,6 +179,7 @@ Button button = new Button(); tab_layout.AddChidren(button); button.Width = Application.GetRealWidth(250); button.Height= Application.GetRealWidth(250); button.Text = TabList[i]; button.X = ControlCommonResourse.XXLeft / 2 + i * button.Width; button.AddTag("Index", i); ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.csold mode 100644 new mode 100755
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -366,7 +366,18 @@ else if (strData == "#DeviceInfo END#") { //ååºååè®¾å¤ var device = CommonDevice.CommonDeviceByByteString(deviceType, this.strTempContentData); CommonDevice device = null; if (HdlCheckLogic.Current.CheckIsNumber(deviceType) == true) { //æ°å¼å为æ°æ°æ®,ç´æ¥è½¬æ¢ device = CommonDevice.CommonDeviceByByteString(Convert.ToInt32(deviceType), this.strTempContentData); } else { //å符串å为æ§æ°æ®,éè¦ç¹æ®å¤ç var myType = (DeviceType)Enum.Parse(typeof(DeviceType), deviceType); device = CommonDevice.CommonDeviceByByteString((int)myType, this.strTempContentData); } if (device != null) { if (this.modelData.dicDeviceInfo.ContainsKey(device.DeviceAddr) == false) @@ -1113,7 +1124,7 @@ foreach (var device in listDevice) { //设å¤ç«¯ç¹ writeText += "#DeviceInfo START#" + device.Type.ToString() + "\r\n"; writeText += "#DeviceInfo START#" + (int)device.Type + "\r\n"; string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(device); writeText += dataInfo + "\r\n"; writeText += "#DeviceInfo END#\r\n\r\n"; @@ -1125,7 +1136,7 @@ var otaDevice = Common.LocalDevice.Current.GetOTADevice(device.DeviceAddr); if (otaDevice != null) { writeText += "#DeviceInfo START#" + otaDevice.Type.ToString() + "\r\n"; writeText += "#DeviceInfo START#" + (int)otaDevice.Type + "\r\n"; string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(otaDevice); writeText += dataInfo2 + "\r\n"; writeText += "#DeviceInfo END#\r\n\r\n"; ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
@@ -60,7 +60,7 @@ //å表æ§ä»¶ this.listview = new FrameListControl(12); listview.Y = btnTile.Bottom + Application.GetRealHeight(17); listview.Height = Application.GetRealHeight(Height) - btnTile.Bottom - Application.GetRealHeight(17); listview.Height = Height - btnTile.Bottom - Application.GetRealHeight(17); detailBackFrame.AddChidren(listview); return listview; ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs
@@ -32,10 +32,10 @@ if (view is FrameRowControl || view is RowLayoutControl) { //FrameRowLayoutæ§ä»¶çæ¶å,ç´æ¥æ©å¤§å®çé«åº¦ var tempView = this.GetChildren(this.ChildrenCount - 1); if (tempView != null) var intBottom = this.GetLocationMostLastViewBottom(); if (intBottom != -1) { view.Y = tempView.Bottom; view.Y = intBottom; } base.AddChidren(view); if (rowSpace > 0) @@ -46,10 +46,10 @@ else { //éFrameRowLayoutæ§ä»¶çæ¶å,计ç®çæ¯åæ var tempView = this.GetChildren(this.ChildrenCount - 1); if (tempView != null) var intBottom = this.GetLocationMostLastViewBottom(); if (intBottom != -1) { view.Y = tempView.Bottom + rowSpace; view.Y = intBottom + rowSpace; } base.AddChidren(view); } @@ -76,5 +76,24 @@ this.Height = bottomHeight + bottomSpace; } } /// <summary> /// è·ååæ åºé¨æä¸é¢çé£ä¸ªæ§ä»¶çåºé¨åæ /// </summary> /// <returns></returns> private int GetLocationMostLastViewBottom() { int bottomHeight = -1; for (int i = 0; i < this.ChildrenCount; i++) { var child = this.GetChildren(i); if (child.Bottom > bottomHeight) { bottomHeight = child.Bottom; } } return bottomHeight; } } } ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
@@ -121,6 +121,23 @@ } } /// <summary> /// æ£æµå符串æ¯å¦æ¯çº¯æ°å /// </summary> /// <param name="i_text"></param> /// <returns></returns> public bool CheckIsNumber(string i_text) { foreach (var c in i_text) { if (char.IsNumber(c) == false) { return false; } } return true; } #endregion #region â æ£æµç½å ³å ±éé误ç¶æç _____________ ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -81,6 +81,15 @@ return null; } var dataResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetShardInfoResult>(result); //对åºæ§çæ¬ç设å¤æ件 Device_OnoffOutput_abcdfrtgg_01 if (dataResult.ShareName.StartsWith("Device_") == true) { var strArry = dataResult.ShareName.Split(new string[] { "_" }, StringSplitOptions.None); if (strArry.Length == 4) { dataResult.ShareName = strArry[0] + "_" + strArry[2] + "_" + strArry[3]; } } //æ件åå listFile.Add(dataResult.ShareName); //ä¿åå°æå®æä»¶å¤¹ä¸ @@ -494,6 +503,15 @@ { //æ§è½ä¼åï¼å¦ææ¬å°æ¥æè¿ä¸ªæ件çè¯,ç´æ¥ä½¿ç¨é£ä¸ªæ件 string fileName = data.ShareName; if (fileName.StartsWith("Device_") == true) { string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries); if (Arry.Length == 4) { //对åºæ§æ°æ®ï¼Device_OnOffOutput_abcjdffdfj_01 fileName = Arry[0] + "_" + Arry[2] + "_" + Arry[3]; } } //è®°å½èµ·å®çä¸»é® memberShardInfo.dicAllShardKeys[fileName] = data.DistributedMark; @@ -574,11 +592,21 @@ else if (fileName.StartsWith("Device_") == true) { string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries); string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3])); this.dicShardDeviceFile[mainKeys] = fileName; //设å¤æ件 dicDeviceFile[mainKeys] = fileName; if (Arry.Length == 4) { //对åºæ§æ°æ®ï¼Device_OnOffOutput_abcjdffdfj_01 string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3])); this.dicShardDeviceFile[mainKeys] = Arry[0] + "_" + Arry[2] + "_" + Arry[3]; //设å¤æ件 dicDeviceFile[mainKeys] = this.dicShardDeviceFile[mainKeys]; } else { string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[1], Convert.ToInt32(Arry[2])); this.dicShardDeviceFile[mainKeys] = fileName; //设å¤æ件 dicDeviceFile[mainKeys] = fileName; } } else if (fileName.StartsWith("Scene_") == true) { ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
@@ -351,7 +351,8 @@ { var way = ZbGateway.GateWayList[i]; var wayId = way.GwId; if (dicZbGatewayDiv.ContainsKey(wayId) == true) //2020.09.18 æ¬å°è¿æ¥æ²¡æè¿æ¥ä¸,åä¸å¤ç if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false) { //å·²ç»å¤çäº continue; ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -358,8 +358,9 @@ for (int i = 0; i < listId.Count; i++) { ZbGateway way = ZbGateway.GateWayList.Find((obj) => obj.GwId == listId[i]); if (way == null) if (way == null || way.localIsConnected == false) { //2020.09.18 æ¬å°è¿æ¥æ²¡æè¿æ¥ä¸,åä¸å¤ç continue; }
@@ -347,7 +347,8 @@ { var way = ZbGateway.GateWayList[i]; var wayId = way.GwId; if (dicZbGatewayDiv.ContainsKey(wayId) == true) //2020.09.18 æ¬å°è¿æ¥æ²¡æè¿æ¥ä¸,åä¸å¤ç if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false) { //å·²ç»å¤çäº continue; ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -347,7 +347,8 @@ { var way = ZbGateway.GateWayList[i]; var wayId = way.GwId; if (dicZbGatewayDiv.ContainsKey(wayId) == true) //2020.09.18 æ¬å°è¿æ¥æ²¡æè¿æ¥ä¸,åä¸å¤ç if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false) { //å·²ç»å¤çäº continue; ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.csold mode 100755 new mode 100644
@@ -1,5 +1,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; namespace Shared.Phone.UserCenter.HideOption @@ -65,7 +66,63 @@ { var form = new HideOptionSearchAllFile(); form.AddForm(Common.Config.Instance.FullPath); }; #if iOS //æ¥çå ¨é¨æ件 var row0 = new FrameRowControl(listView.rowSpace / 2); listView.AddChidren(row0); row0.AddLeftCaption("IOSå¾ç", 800); row0.AddRightArrow(); row0.AddBottomLine(); row0.ButtonClickEvent += (sender, e) => { string fileName = "Item/Add.png"; if (File.Exists(Path.Combine(Application.RootPath, fileName))) { var form = new HideOptionSearchAllFile(); form.AddForm(Application.RootPath); return; } string dirPath = string.Empty; if (Application.Skin != null) { dirPath = Application.Skin + "/" + fileName; if (File.Exists(Path.Combine(Application.RootPath, dirPath))) { var form = new HideOptionSearchAllFile(); form.AddForm(Path.Combine(Application.RootPath, Application.Skin + "/")); return; } string text2 = Foundation.NSBundle.MainBundle.PathForResource(dirPath, null); if (text2 != null) { var form = new HideOptionSearchAllFile(); form.AddForm(text2.Replace(dirPath, string.Empty)); return; } } else { dirPath = "Phone/" + fileName; if (File.Exists(Path.Combine(Application.RootPath, dirPath))) { var form = new HideOptionSearchAllFile(); form.AddForm(Path.Combine(Application.RootPath, "Phone/")); return; } string text2 = Foundation.NSBundle.MainBundle.PathForResource(dirPath, null); if (text2 != null) { var form = new HideOptionSearchAllFile(); form.AddForm(text2.Replace(dirPath, string.Empty)); return; } } }; #endif //æ¥çå ¨é¨æ件 var row2 = new FrameRowControl(listView.rowSpace / 2); @@ -104,10 +161,10 @@ }; } #endregion #endregion #region â ä¸è¬æ¹æ³___________________________ #region â ä¸è¬æ¹æ³___________________________ #endregion #endregion } } ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.csold mode 100755 new mode 100644
@@ -65,7 +65,7 @@ nextDir += Arry[i] + "/"; } //åå§åä¸é¨ä¿¡æ¯ this.InitMiddleFrame(nextDir); this.InitMiddleFrame(nextDir.Trim('/')); }; } @@ -89,16 +89,23 @@ //} //else { var files = System.IO.Directory.GetDirectories(directory); foreach (var file in files) { string[] arry = file.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries); listDirectory.Add(arry[arry.Length - 1]); try { var files = System.IO.Directory.GetDirectories(directory); foreach (var file in files) { string[] arry = file.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries); listDirectory.Add(arry[arry.Length - 1]); } listDirectory.Sort(); listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/')); listAllFile.Sort(); } listDirectory.Sort(); listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/')); listAllFile.Sort(); catch { this.ShowMassage(ShowMsgType.Tip, "读åæ件夹å 容失败"); } } var listView = new VerticalListControl(23); ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -446,16 +446,20 @@ string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys); if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true) { var strArry = deviceFile.Split('_'); if (strArry.Length < 3) //ä»å享æ件ä¸åºåååæ¥ var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile); if (deviceData == null) { continue; } //ä»å享æ件ä¸åºåååæ¥ var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile); try { var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData)); var jobject = Newtonsoft.Json.Linq.JObject.Parse(System.Text.Encoding.UTF8.GetString(deviceData)); if (jobject.Property("DeviceID") == null) { continue; } var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(Convert.ToInt32(jobject["DeviceID"].ToString()), System.Text.Encoding.UTF8.GetString(deviceData)); if (device != null) { listDevice.Add(device); ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -61,7 +61,7 @@ /// </summary> public int DeviceEpoint; /// <summary> /// 设å¤id /// å®é ç设å¤id /// <para>258:color dimmable light,è°å ³ç¯ </para> /// <para>10:Door lock,é¨é</para> /// <para>514:Window covering device,çªå¸</para> @@ -72,7 +72,17 @@ /// <para>262:Light sensor,å ç §ä¼ æå¨</para> /// <para>1026:sensor,ä¼ æå¨ï¼å ·ä½ç±»åçä¼ æå¨DeviceTypeæ¥åºå</para> /// </summary> public int DeviceID; public int DeviceID; /// <summary> /// <para>2020.09.21追å :为äºå¯¹åºç¬¬ä¸æ¹è®¾å¤,以åä¹åçå¤è®¾å¤IDé®é¢,追å çåé</para> /// <para>è¿æ¯ä¸ªç¹æ®ç,并ä¸ä¸ä¿åå¨æ件å½ä¸çID, DeviceTypeç±æ¤å¼æ å°åºæ¥</para> /// <para>å½è®¾å¤æ¯æ²³ä¸è®¾å¤æ¶,å®ä¸DeviceIDç¸ç</para> /// <para>å½æ¯çæ£ç第ä¸æ¹è®¾å¤æ¶,å®æå¯è½ä¸DeviceIDä¸ç¸ç</para> /// <para>æ¯å¦ï¼2å256é½æ¯ç»§çµå¨,é£ä¹ãDeviceID为2 æè DeviceID为256ã è ãExDeviceIDåºå®ä¸º2ã,ãDeviceType为OnOffOutputã</para> /// <para>éä¿æ¥è¯´ï¼DeviceIDæ¯å®é æ£ç¡®çID,èãExDeviceIDæ¯ä¸ç§æå±æ¦å¿µçIDã</para> /// </summary> [Newtonsoft.Json.JsonIgnore] public int ExDeviceID; /// <summary> /// 该å段主è¦é对IASå®é²è®¾å¤è®¾ç«ãææIASå®é²è®¾å¤å ±ç¨ä¸ä¸ªDeviceID为1026ãæ以è¦åºåå设å¤ç±»åï¼éè¦è¯¥å段ã /// ç¬é´æ°æ®ä¸æ¥çä¼ æå¨ (MomentStatus=1 TriggerZoneStatus>=1ï¼æ¥è¦ï¼) @@ -230,10 +240,8 @@ { get { var deviceType = Type.ToString(); var fileName = "Device_" + deviceType + "_" + DeviceAddr; fileName += "_" + (DeviceEpoint.ToString().Length < 2 ? "0" + DeviceEpoint.ToString() : DeviceEpoint.ToString()); return fileName; //2020.09.21 对åºç¬¬ä¸æ¹è®¾å¤å¯ä»¥å ¥ç½,设å¤æ件åå,å»æ deviceType return "Device_" + DeviceAddr + "_" + DeviceEpoint.ToString().PadLeft(2, '0'); } } @@ -244,123 +252,129 @@ /// <summary> /// ç±è®¾å¤å符串æ¯ç¹æ¢å¤è®¾å¤å¯¹è±¡ /// </summary> /// <param name="strDeviceType">设å¤DeviceTypeçå符串类å</param> /// <param name="intDeviceType">设å¤DeviceTypeçæ´åå¼</param> /// <param name="strDeviceByte">设å¤Jsonæ件转为æ¯ç¹åå转为çå符串</param> /// <returns></returns> public static CommonDevice CommonDeviceByByteString(string strDeviceType, string strDeviceByte) { public static CommonDevice CommonDeviceByByteString(int intDeviceType, string strDeviceByte) { //è¿æ¯æ²³ä¸çç¹æ®ç«¯ç¹,ä¸éè¦å¤ç if (intDeviceType == 49408) { return null; } CommonDevice device = null; if (strDeviceType == ZigBee.Device.DeviceType.DimmableLight.ToString()) if (intDeviceType == (int)DeviceType.DimmableLight || intDeviceType == 3) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<DimmableLight>(strDeviceByte); device.ExDeviceID = (int)DeviceType.DimmableLight; } else if (strDeviceType == ZigBee.Device.DeviceType.OnOffOutput.ToString()) else if (intDeviceType == (int)DeviceType.OnOffOutput || intDeviceType == 256) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte); device = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte); device.ExDeviceID = (int)DeviceType.OnOffOutput; } else if (strDeviceType == ZigBee.Device.DeviceType.ColorDimmerSwitch.ToString()) else if (intDeviceType == (int)DeviceType.ColorDimmerSwitch) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmerSwitch>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.LevelControlSwitch.ToString()) else if (intDeviceType == (int)DeviceType.LevelControlSwitch) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<LevelControlSwitch>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringDevice.ToString()) else if (intDeviceType == (int)DeviceType.WindowCoveringDevice) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringController.ToString()) else if (intDeviceType == (int)DeviceType.WindowCoveringController) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<WindowCoveringController>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.OnOffSwitch.ToString()) else if (intDeviceType == (int)DeviceType.OnOffSwitch) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<Panel>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.IASZone.ToString()) else if (intDeviceType == (int)DeviceType.IASZone) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.OtaDevice.ToString() || strDeviceType == ZigBee.Device.DeviceType.OtaPanelDevice.ToString()) else if (intDeviceType == (int)DeviceType.OtaDevice || intDeviceType == (int)DeviceType.OtaPanelDevice) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<OTADevice>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.AirSwitch.ToString()) else if (intDeviceType == (int)DeviceType.AirSwitch) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<AirSwitch>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.Repeater.ToString()) else if (intDeviceType == (int)DeviceType.Repeater) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<Repeater>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.Thermostat.ToString()) else if (intDeviceType == (int)DeviceType.Thermostat) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.Transverter.ToString()) else if (intDeviceType == (int)DeviceType.Transverter) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<Transverter>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.DoorLock.ToString()) else if (intDeviceType == (int)DeviceType.DoorLock) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLock>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.TemperatureSensor.ToString()) else if (intDeviceType == (int)DeviceType.TemperatureSensor) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.FreshAirHumiditySensor.ToString()) else if (intDeviceType == (int)DeviceType.FreshAirHumiditySensor) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<HumiditySensor>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.FreshAir.ToString()) else if (intDeviceType == (int)DeviceType.FreshAir) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString()) else if (intDeviceType == (int)DeviceType.PMSensor) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.ColorTemperatureLight.ToString()) else if (intDeviceType == (int)DeviceType.ColorTemperatureLight) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorTemperatureLight>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.Buzzer.ToString()) else if (intDeviceType == (int)DeviceType.Buzzer) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<Buzzer>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.ColorDimmableLight.ToString()) else if (intDeviceType == (int)DeviceType.ColorDimmableLight) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmableLight>(strDeviceByte); } else if (strDeviceType == ZigBee.Device.DeviceType.DimmerSwitch.ToString()) else if (intDeviceType == (int)DeviceType.DimmerSwitch) { device = Newtonsoft.Json.JsonConvert.DeserializeObject<DimmerSwitch>(strDeviceByte); } else { return null; { device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(strDeviceByte); } //è¿æ¯æ²³ä¸çç¹æ®ç«¯ç¹,ä¸éè¦å¤ç if (device.DeviceEpoint == 242 && intDeviceType == 97) { return null; } if (device.ExDeviceID == 0) { //èµåå§å¼ device.ExDeviceID = device.DeviceID; } //è½å°åä¸ä¸ªåéå°±å°åä¸ä¸ª device.Type = (DeviceType)device.DeviceID; device.Type = (DeviceType)device.ExDeviceID; return device; } /// <summary> /// ç±è®¾å¤è·¯å¾æ¢å¤è®¾å¤å¯¹è±¡ /// </summary> /// <returns>The device by file path.</returns> /// <param name="deviceFilePath">Device file path.</param> public static CommonDevice CommonDeviceByFilePath(string deviceFilePath) { var v = deviceFilePath.Split('_'); if (v.Length < 3) { return null; } return CommonDeviceByByteString(v[1], System.Text.Encoding.UTF8.GetString(Shared.Common.Global.ReadFileByHomeId(deviceFilePath))); } /// <summary> ZigbeeApp/packages/Newtonsoft.Json.11.0.1/LICENSE.md
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net20/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net20/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net35/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net35/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net40/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net40/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net45/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/net45/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/netstandard1.0/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/netstandard1.0/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/netstandard1.3/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/netstandard1.3/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/netstandard2.0/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/netstandard2.0/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.xml
File was deleted ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dllBinary files differ
ZigbeeApp/packages/Newtonsoft.Json.11.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.xml
File was deleted
