diff --git a/azure_m/azure_m.sln b/azure_m/azure_m.sln index 257bcdbdbe6d099a2c5e6bfdf45a46cddc44f04f..4c2f7942d63c01a931183e1f3cee9184b0441283 100644 --- a/azure_m/azure_m.sln +++ b/azure_m/azure_m.sln @@ -9,7 +9,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "azure_m.iOS", "azure_m\azur EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "azure_m", "azure_m\azure_m\azure_m.csproj", "{F485F160-DB1E-40DB-9044-C0E8487CB3AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "azure_m.Test", "azure_m\azure_m.Test\azure_m.Test.csproj", "{50C36B69-BD94-4B8E-85EE-F2F460145B5B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "azure_m.Test", "azure_m\azure_m.Test\azure_m.Test.csproj", "{50C36B69-BD94-4B8E-85EE-F2F460145B5B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pesudo_back", "pesudo_back\pesudo_back.csproj", "{21A72531-5462-4EA2-B916-C847E137AFE0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -87,6 +89,18 @@ Global {50C36B69-BD94-4B8E-85EE-F2F460145B5B}.Release|iPhone.Build.0 = Release|Any CPU {50C36B69-BD94-4B8E-85EE-F2F460145B5B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {50C36B69-BD94-4B8E-85EE-F2F460145B5B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Debug|iPhone.Build.0 = Debug|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Release|Any CPU.Build.0 = Release|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Release|iPhone.ActiveCfg = Release|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Release|iPhone.Build.0 = Release|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {21A72531-5462-4EA2-B916-C847E137AFE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs index af6ee1777cec61cb88ca8954b9386a56f4422489..0b8d56b62eb118603da4ee2f5a44074c1ba01914 100644 --- a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs +++ b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace azure_m.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.0.26")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")] public partial class Resource { @@ -16547,211 +16547,232 @@ namespace azure_m.Droid public const int design_snackbar_background = 2131165288; // aapt resource value: 0x7F070069 - public const int down4 = 2131165289; + public const int directory5 = 2131165289; // aapt resource value: 0x7F07006A - public const int down6 = 2131165290; + public const int down4 = 2131165290; // aapt resource value: 0x7F07006B - public const int group5 = 2131165291; + public const int down6 = 2131165291; // aapt resource value: 0x7F07006C - public const int home1 = 2131165292; - - // aapt resource value: 0x7F070074 - public const int icon_about = 2131165300; - - // aapt resource value: 0x7F070075 - public const int icon_feed = 2131165301; + public const int group5 = 2131165292; // aapt resource value: 0x7F07006D - public const int ic_arrow_down_24dp = 2131165293; + public const int help5 = 2131165293; // aapt resource value: 0x7F07006E - public const int ic_clock_black_24dp = 2131165294; + public const int history5 = 2131165294; // aapt resource value: 0x7F07006F - public const int ic_keyboard_black_24dp = 2131165295; + public const int home1 = 2131165295; + + // aapt resource value: 0x7F070077 + public const int icon_about = 2131165303; + + // aapt resource value: 0x7F070078 + public const int icon_feed = 2131165304; // aapt resource value: 0x7F070070 - public const int ic_mtrl_checked_circle = 2131165296; + public const int ic_arrow_down_24dp = 2131165296; // aapt resource value: 0x7F070071 - public const int ic_mtrl_chip_checked_black = 2131165297; + public const int ic_clock_black_24dp = 2131165297; // aapt resource value: 0x7F070072 - public const int ic_mtrl_chip_checked_circle = 2131165298; + public const int ic_keyboard_black_24dp = 2131165298; // aapt resource value: 0x7F070073 - public const int ic_mtrl_chip_close_circle = 2131165299; + public const int ic_mtrl_checked_circle = 2131165299; - // aapt resource value: 0x7F070076 - public const int log3 = 2131165302; + // aapt resource value: 0x7F070074 + public const int ic_mtrl_chip_checked_black = 2131165300; - // aapt resource value: 0x7F070077 - public const int material_cursor_drawable = 2131165303; + // aapt resource value: 0x7F070075 + public const int ic_mtrl_chip_checked_circle = 2131165301; - // aapt resource value: 0x7F070078 - public const int material_ic_calendar_black_24dp = 2131165304; + // aapt resource value: 0x7F070076 + public const int ic_mtrl_chip_close_circle = 2131165302; // aapt resource value: 0x7F070079 - public const int material_ic_clear_black_24dp = 2131165305; + public const int log3 = 2131165305; // aapt resource value: 0x7F07007A - public const int material_ic_edit_black_24dp = 2131165306; + public const int market5 = 2131165306; // aapt resource value: 0x7F07007B - public const int material_ic_keyboard_arrow_left_black_24dp = 2131165307; + public const int material_cursor_drawable = 2131165307; // aapt resource value: 0x7F07007C - public const int material_ic_keyboard_arrow_next_black_24dp = 2131165308; + public const int material_ic_calendar_black_24dp = 2131165308; // aapt resource value: 0x7F07007D - public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165309; + public const int material_ic_clear_black_24dp = 2131165309; // aapt resource value: 0x7F07007E - public const int material_ic_keyboard_arrow_right_black_24dp = 2131165310; + public const int material_ic_edit_black_24dp = 2131165310; // aapt resource value: 0x7F07007F - public const int material_ic_menu_arrow_down_black_24dp = 2131165311; + public const int material_ic_keyboard_arrow_left_black_24dp = 2131165311; // aapt resource value: 0x7F070080 - public const int material_ic_menu_arrow_up_black_24dp = 2131165312; + public const int material_ic_keyboard_arrow_next_black_24dp = 2131165312; // aapt resource value: 0x7F070081 - public const int menu0 = 2131165313; + public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165313; // aapt resource value: 0x7F070082 - public const int menu1 = 2131165314; + public const int material_ic_keyboard_arrow_right_black_24dp = 2131165314; // aapt resource value: 0x7F070083 - public const int monitor2 = 2131165315; + public const int material_ic_menu_arrow_down_black_24dp = 2131165315; // aapt resource value: 0x7F070084 - public const int more2 = 2131165316; + public const int material_ic_menu_arrow_up_black_24dp = 2131165316; // aapt resource value: 0x7F070085 - public const int more4 = 2131165317; + public const int menu0 = 2131165317; // aapt resource value: 0x7F070086 - public const int more6 = 2131165318; + public const int menu1 = 2131165318; // aapt resource value: 0x7F070087 - public const int mtrl_dialog_background = 2131165319; + public const int monitor2 = 2131165319; // aapt resource value: 0x7F070088 - public const int mtrl_dropdown_arrow = 2131165320; + public const int more2 = 2131165320; // aapt resource value: 0x7F070089 - public const int mtrl_ic_arrow_drop_down = 2131165321; + public const int more4 = 2131165321; // aapt resource value: 0x7F07008A - public const int mtrl_ic_arrow_drop_up = 2131165322; + public const int more6 = 2131165322; // aapt resource value: 0x7F07008B - public const int mtrl_ic_cancel = 2131165323; + public const int mtrl_dialog_background = 2131165323; // aapt resource value: 0x7F07008C - public const int mtrl_ic_error = 2131165324; + public const int mtrl_dropdown_arrow = 2131165324; // aapt resource value: 0x7F07008D - public const int mtrl_navigation_bar_item_background = 2131165325; + public const int mtrl_ic_arrow_drop_down = 2131165325; // aapt resource value: 0x7F07008E - public const int mtrl_popupmenu_background = 2131165326; + public const int mtrl_ic_arrow_drop_up = 2131165326; // aapt resource value: 0x7F07008F - public const int mtrl_popupmenu_background_dark = 2131165327; + public const int mtrl_ic_cancel = 2131165327; // aapt resource value: 0x7F070090 - public const int mtrl_tabs_default_indicator = 2131165328; + public const int mtrl_ic_error = 2131165328; // aapt resource value: 0x7F070091 - public const int navigation_empty_icon = 2131165329; + public const int mtrl_navigation_bar_item_background = 2131165329; // aapt resource value: 0x7F070092 - public const int notification_action_background = 2131165330; + public const int mtrl_popupmenu_background = 2131165330; // aapt resource value: 0x7F070093 - public const int notification_bg = 2131165331; + public const int mtrl_popupmenu_background_dark = 2131165331; // aapt resource value: 0x7F070094 - public const int notification_bg_low = 2131165332; + public const int mtrl_tabs_default_indicator = 2131165332; // aapt resource value: 0x7F070095 - public const int notification_bg_low_normal = 2131165333; + public const int navigation_empty_icon = 2131165333; // aapt resource value: 0x7F070096 - public const int notification_bg_low_pressed = 2131165334; + public const int notification_action_background = 2131165334; // aapt resource value: 0x7F070097 - public const int notification_bg_normal = 2131165335; + public const int notification_bg = 2131165335; // aapt resource value: 0x7F070098 - public const int notification_bg_normal_pressed = 2131165336; + public const int notification_bg_low = 2131165336; // aapt resource value: 0x7F070099 - public const int notification_icon_background = 2131165337; + public const int notification_bg_low_normal = 2131165337; // aapt resource value: 0x7F07009A - public const int notification_template_icon_bg = 2131165338; + public const int notification_bg_low_pressed = 2131165338; // aapt resource value: 0x7F07009B - public const int notification_template_icon_low_bg = 2131165339; + public const int notification_bg_normal = 2131165339; // aapt resource value: 0x7F07009C - public const int notification_tile_bg = 2131165340; + public const int notification_bg_normal_pressed = 2131165340; // aapt resource value: 0x7F07009D - public const int notify_panel_notification_icon_bg = 2131165341; + public const int notification_icon_background = 2131165341; // aapt resource value: 0x7F07009E - public const int preference_list_divider_material = 2131165342; + public const int notification_template_icon_bg = 2131165342; // aapt resource value: 0x7F07009F - public const int recent5 = 2131165343; + public const int notification_template_icon_low_bg = 2131165343; // aapt resource value: 0x7F0700A0 - public const int refresh4 = 2131165344; + public const int notification_tile_bg = 2131165344; // aapt resource value: 0x7F0700A1 - public const int security6 = 2131165345; + public const int notify_panel_notification_icon_bg = 2131165345; // aapt resource value: 0x7F0700A2 - public const int setting0 = 2131165346; + public const int preference_list_divider_material = 2131165346; // aapt resource value: 0x7F0700A3 - public const int settings4 = 2131165347; + public const int recent5 = 2131165347; // aapt resource value: 0x7F0700A4 - public const int star1 = 2131165348; + public const int refresh4 = 2131165348; // aapt resource value: 0x7F0700A5 - public const int subscribe5 = 2131165349; + public const int res5 = 2131165349; // aapt resource value: 0x7F0700A6 - public const int test_custom_background = 2131165350; + public const int security6 = 2131165350; // aapt resource value: 0x7F0700A7 - public const int tooltip_frame_dark = 2131165351; + public const int service5 = 2131165351; // aapt resource value: 0x7F0700A8 - public const int tooltip_frame_light = 2131165352; + public const int setting0 = 2131165352; // aapt resource value: 0x7F0700A9 - public const int up4 = 2131165353; + public const int settings4 = 2131165353; // aapt resource value: 0x7F0700AA - public const int user0 = 2131165354; + public const int star1 = 2131165354; // aapt resource value: 0x7F0700AB - public const int view3 = 2131165355; + public const int subscribe5 = 2131165355; // aapt resource value: 0x7F0700AC - public const int vm2 = 2131165356; + public const int test_custom_background = 2131165356; // aapt resource value: 0x7F0700AD - public const int xamarin_logo = 2131165357; + public const int tooltip_frame_dark = 2131165357; + + // aapt resource value: 0x7F0700AE + public const int tooltip_frame_light = 2131165358; + + // aapt resource value: 0x7F0700AF + public const int up4 = 2131165359; + + // aapt resource value: 0x7F0700B0 + public const int user0 = 2131165360; + + // aapt resource value: 0x7F0700B1 + public const int view3 = 2131165361; + + // aapt resource value: 0x7F0700B2 + public const int vm2 = 2131165362; + + // aapt resource value: 0x7F0700B3 + public const int vm5 = 2131165363; + + // aapt resource value: 0x7F0700B4 + public const int xamarin_logo = 2131165364; static Drawable() { diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-azure\347\233\256\345\275\225.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/directory5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-azure\347\233\256\345\275\225.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/directory5.png diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\345\270\256\345\212\251\346\224\257\346\214\201.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/help5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\345\270\256\345\212\251\346\224\257\346\214\201.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/help5.png diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\346\234\200\350\277\221.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/history5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\346\234\200\350\277\221.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/history5.png diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\345\276\256\350\275\257.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\345\276\256\350\275\257.png" deleted file mode 100644 index 51e75f8b9e4dd07112d8428b2f326e2e8e83b366..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\345\276\256\350\275\257.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\346\266\210\346\201\257\346\217\220\351\206\222.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\346\266\210\346\201\257\346\217\220\351\206\222.png" deleted file mode 100644 index 153d851203e342b42eca84c60e87b7144be2c655..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\346\266\210\346\201\257\346\217\220\351\206\222.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\347\224\250\346\210\267.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\347\224\250\346\210\267.png" deleted file mode 100644 index 9a86a358e99b6180b7f106b2298a9b5fe27a8950..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\347\224\250\346\210\267.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\347\263\273\347\273\237\350\217\234\345\215\225.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\347\263\273\347\273\237\350\217\234\345\215\225.png" deleted file mode 100644 index a0a5a7e904885037bcdab73d48d59f8d5f8e9476..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\347\263\273\347\273\237\350\217\234\345\215\225.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\350\256\276\347\275\256.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\350\256\276\347\275\256.png" deleted file mode 100644 index 3e456ff38bc140938d41b2956e6595b6d62587f8..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/0-\350\256\276\347\275\256.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\344\270\273\351\241\265.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\344\270\273\351\241\265.png" deleted file mode 100644 index 5e6d907b763b3acc370736c36147ba18c0d371f2..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\344\270\273\351\241\265.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\344\273\252\350\241\250\346\235\277.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\344\273\252\350\241\250\346\235\277.png" deleted file mode 100644 index 03be05da430cf5bb39e684014b9e3684af989b1a..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\344\273\252\350\241\250\346\235\277.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\345\210\233\345\273\272\350\265\204\346\272\220.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\345\210\233\345\273\272\350\265\204\346\272\220.png" deleted file mode 100644 index 5069f6730a0193667d906b22b24dba3c4ae70a61..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\345\210\233\345\273\272\350\265\204\346\272\220.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\346\211\200\346\234\211\345\210\206\347\261\273.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\346\211\200\346\234\211\345\210\206\347\261\273.png" deleted file mode 100644 index d0284404667c0e76d60c78abdc2a0b1d6fa971c9..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\346\211\200\346\234\211\345\210\206\347\261\273.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\346\224\266\350\227\217\345\244\271.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\346\224\266\350\227\217\345\244\271.png" deleted file mode 100644 index 795a787725df617eb9d5e0199d30ab14f744058e..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\346\224\266\350\227\217\345\244\271.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\350\217\234\345\215\225.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\350\217\234\345\215\225.png" deleted file mode 100644 index 752ee56eb8647dceb50a7adb4865f1b8462c242d..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/1-\350\217\234\345\215\225.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\344\273\252\350\241\250\347\233\230.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\344\273\252\350\241\250\347\233\230.png" deleted file mode 100644 index 1083e00701e6dad68b5e1043a701b7f27545aaa6..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\344\273\252\350\241\250\347\233\230.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\345\210\233\345\273\272\350\265\204\346\272\220.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\345\210\233\345\273\272\350\265\204\346\272\220.png" deleted file mode 100644 index 1cc3199128d5a7ace87f1df34c8fe3db82446049..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\345\210\233\345\273\272\350\265\204\346\272\220.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\346\233\264\345\244\232.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\346\233\264\345\244\232.png" deleted file mode 100644 index e70a347799269049f00b96c290cd2fcc0bcaaeec..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\346\233\264\345\244\232.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\347\233\221\350\247\206\345\231\250.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\347\233\221\350\247\206\345\231\250.png" deleted file mode 100644 index 9540725bf293e0023e9f047e90864f2fa2af0efe..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\347\233\221\350\247\206\345\231\250.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\350\256\242\351\230\205.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\350\256\242\351\230\205.png" deleted file mode 100644 index 9f8b3a6a98deedc7712da89d68342a1a9a7a4851..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\350\256\242\351\230\205.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\346\214\207\346\240\207.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\346\214\207\346\240\207.png" deleted file mode 100644 index 6aa2d887c0206a30cc2ef058164b0975deb6a95b..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\346\214\207\346\240\207.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\346\227\245\345\277\227.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\346\227\245\345\277\227.png" deleted file mode 100644 index b9195854e918cd9e5171f58e3b46a6b506391ca8..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\346\227\245\345\277\227.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\347\233\221\350\247\206\345\231\250.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\347\233\221\350\247\206\345\231\250.png" deleted file mode 100644 index 9540725bf293e0023e9f047e90864f2fa2af0efe..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\347\233\221\350\247\206\345\231\250.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\350\247\206\345\233\276.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\350\247\206\345\233\276.png" deleted file mode 100644 index 4a254bf901b2002c081c24aa422f8b6cf525a27f..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\350\247\206\345\233\276.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\350\255\246\346\212\245.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\350\255\246\346\212\245.png" deleted file mode 100644 index 69534d38cb56a607522509c882b86c107b3bee0c..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/3-\350\255\246\346\212\245.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\210\233\345\273\272.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\210\233\345\273\272.png" deleted file mode 100644 index 5943331465f36742a547aac2dd4ac37c86a38ef7..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\210\233\345\273\272.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\210\267\346\226\260.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\210\267\346\226\260.png" deleted file mode 100644 index c481e898d8b14b59d69a9bf5d6f6686efe984c43..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\210\267\346\226\260.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\233\272\345\256\232.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\233\272\345\256\232.png" deleted file mode 100644 index 0d73b1f0ca3f6e2190c0387ccbbcfb0f84329564..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\345\233\272\345\256\232.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\346\233\264\345\244\232.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\346\233\264\345\244\232.png" deleted file mode 100644 index 1cd975d0bf9a96734ba03ba31ec0e957a3b8c823..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\346\233\264\345\244\232.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\347\256\241\347\220\206\346\233\264\345\244\232.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\347\256\241\347\220\206\346\233\264\345\244\232.png" deleted file mode 100644 index ccd98823e6fbffe0c9e90e6120f66369cdfa16c5..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\347\256\241\347\220\206\346\233\264\345\244\232.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\347\256\241\347\220\206\350\247\206\345\233\276.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\347\256\241\347\220\206\350\247\206\345\233\276.png" deleted file mode 100644 index de97781584beea01d05fa02c0b4b4ed7bfa984f5..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/4-\347\256\241\347\220\206\350\247\206\345\233\276.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\346\211\200\346\234\211\350\265\204\346\272\220.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\346\211\200\346\234\211\350\265\204\346\272\220.png" deleted file mode 100644 index 1c4e8d69faf87df1d45b2d4bda34efd510ea1684..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\346\211\200\346\234\211\350\265\204\346\272\220.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\231\232\346\213\237\346\234\272.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\231\232\346\213\237\346\234\272.png" deleted file mode 100644 index 61a9eae9c0e2d4d011c62ba1e8822e1524299f74..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\231\232\346\213\237\346\234\272.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\256\242\351\230\205.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\256\242\351\230\205.png" deleted file mode 100644 index 9f8b3a6a98deedc7712da89d68342a1a9a7a4851..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\256\242\351\230\205.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\345\220\215\347\247\260\347\261\273\345\236\213\347\255\211\344\270\213\347\256\255\345\244\264.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\345\220\215\347\247\260\347\261\273\345\236\213\347\255\211\344\270\213\347\256\255\345\244\264.png" deleted file mode 100644 index ba22b62cf4c4e5e60bcd19f7fadffa17da2a08b6..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\345\220\215\347\247\260\347\261\273\345\236\213\347\255\211\344\270\213\347\256\255\345\244\264.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\345\256\211\345\205\250\350\265\204\346\272\220.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\345\256\211\345\205\250\350\265\204\346\272\220.png" deleted file mode 100644 index 88230648c60ed90701e0a47981edcf7560f95503..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\345\256\211\345\205\250\350\265\204\346\272\220.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\346\211\200\346\234\211\346\234\215\345\212\241.png" "b/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\346\211\200\346\234\211\346\234\215\345\212\241.png" deleted file mode 100644 index 403eb06b0121f1cb9c4e2660eb7e58dbbe961ee4..0000000000000000000000000000000000000000 Binary files "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/6-\346\211\200\346\234\211\346\234\215\345\212\241.png" and /dev/null differ diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\345\270\202\345\234\272.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/market5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\345\270\202\345\234\272.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/market5.png diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\265\204\346\272\220\347\273\204.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/res5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\350\265\204\346\272\220\347\273\204.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/res5.png diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\345\272\224\347\224\250\347\250\213\345\272\217\346\234\215\345\212\241.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/service5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/5-\345\272\224\347\224\250\347\250\213\345\272\217\346\234\215\345\212\241.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/service5.png diff --git "a/azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\350\231\232\346\213\237\346\234\272.png" b/azure_m/azure_m/azure_m.Android/Resources/drawable/vm5.png similarity index 100% rename from "azure_m/azure_m/azure_m.Android/Resources/drawable/icon/2-\350\231\232\346\213\237\346\234\272.png" rename to azure_m/azure_m/azure_m.Android/Resources/drawable/vm5.png diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/0menu.png b/azure_m/azure_m/azure_m.Android/Resources/icon/0menu.png deleted file mode 100644 index a0a5a7e904885037bcdab73d48d59f8d5f8e9476..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/0menu.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/0message.png b/azure_m/azure_m/azure_m.Android/Resources/icon/0message.png deleted file mode 100644 index 153d851203e342b42eca84c60e87b7144be2c655..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/0message.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/0microsoft.png b/azure_m/azure_m/azure_m.Android/Resources/icon/0microsoft.png deleted file mode 100644 index 51e75f8b9e4dd07112d8428b2f326e2e8e83b366..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/0microsoft.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/0setting.png b/azure_m/azure_m/azure_m.Android/Resources/icon/0setting.png deleted file mode 100644 index 3e456ff38bc140938d41b2956e6595b6d62587f8..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/0setting.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/0user.png b/azure_m/azure_m/azure_m.Android/Resources/icon/0user.png deleted file mode 100644 index 9a86a358e99b6180b7f106b2298a9b5fe27a8950..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/0user.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/1add.png b/azure_m/azure_m/azure_m.Android/Resources/icon/1add.png deleted file mode 100644 index 5069f6730a0193667d906b22b24dba3c4ae70a61..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/1add.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/1all.png b/azure_m/azure_m/azure_m.Android/Resources/icon/1all.png deleted file mode 100644 index d0284404667c0e76d60c78abdc2a0b1d6fa971c9..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/1all.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/1dashboard.png b/azure_m/azure_m/azure_m.Android/Resources/icon/1dashboard.png deleted file mode 100644 index 03be05da430cf5bb39e684014b9e3684af989b1a..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/1dashboard.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/1home.png b/azure_m/azure_m/azure_m.Android/Resources/icon/1home.png deleted file mode 100644 index 5e6d907b763b3acc370736c36147ba18c0d371f2..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/1home.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/1menu.png b/azure_m/azure_m/azure_m.Android/Resources/icon/1menu.png deleted file mode 100644 index 752ee56eb8647dceb50a7adb4865f1b8462c242d..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/1menu.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/1star.png b/azure_m/azure_m/azure_m.Android/Resources/icon/1star.png deleted file mode 100644 index 795a787725df617eb9d5e0199d30ab14f744058e..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/1star.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/2add.png b/azure_m/azure_m/azure_m.Android/Resources/icon/2add.png deleted file mode 100644 index 1cc3199128d5a7ace87f1df34c8fe3db82446049..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/2add.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/2dashboard.png b/azure_m/azure_m/azure_m.Android/Resources/icon/2dashboard.png deleted file mode 100644 index 1083e00701e6dad68b5e1043a701b7f27545aaa6..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/2dashboard.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/2monitor.png b/azure_m/azure_m/azure_m.Android/Resources/icon/2monitor.png deleted file mode 100644 index 9540725bf293e0023e9f047e90864f2fa2af0efe..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/2monitor.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/2more.png b/azure_m/azure_m/azure_m.Android/Resources/icon/2more.png deleted file mode 100644 index e70a347799269049f00b96c290cd2fcc0bcaaeec..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/2more.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/2subs.png b/azure_m/azure_m/azure_m.Android/Resources/icon/2subs.png deleted file mode 100644 index 9f8b3a6a98deedc7712da89d68342a1a9a7a4851..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/2subs.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/2vm.png b/azure_m/azure_m/azure_m.Android/Resources/icon/2vm.png deleted file mode 100644 index 61a9eae9c0e2d4d011c62ba1e8822e1524299f74..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/2vm.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/3alarm.png b/azure_m/azure_m/azure_m.Android/Resources/icon/3alarm.png deleted file mode 100644 index 69534d38cb56a607522509c882b86c107b3bee0c..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/3alarm.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/3dash.png b/azure_m/azure_m/azure_m.Android/Resources/icon/3dash.png deleted file mode 100644 index 6aa2d887c0206a30cc2ef058164b0975deb6a95b..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/3dash.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/3log.png b/azure_m/azure_m/azure_m.Android/Resources/icon/3log.png deleted file mode 100644 index b9195854e918cd9e5171f58e3b46a6b506391ca8..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/3log.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/3monitor.png b/azure_m/azure_m/azure_m.Android/Resources/icon/3monitor.png deleted file mode 100644 index 9540725bf293e0023e9f047e90864f2fa2af0efe..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/3monitor.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/3view.png b/azure_m/azure_m/azure_m.Android/Resources/icon/3view.png deleted file mode 100644 index 4a254bf901b2002c081c24aa422f8b6cf525a27f..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/3view.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/4add.png b/azure_m/azure_m/azure_m.Android/Resources/icon/4add.png deleted file mode 100644 index 5943331465f36742a547aac2dd4ac37c86a38ef7..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/4add.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/4anchor.png b/azure_m/azure_m/azure_m.Android/Resources/icon/4anchor.png deleted file mode 100644 index 0d73b1f0ca3f6e2190c0387ccbbcfb0f84329564..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/4anchor.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/4manageall.png b/azure_m/azure_m/azure_m.Android/Resources/icon/4manageall.png deleted file mode 100644 index ccd98823e6fbffe0c9e90e6120f66369cdfa16c5..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/4manageall.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/4manageview.png b/azure_m/azure_m/azure_m.Android/Resources/icon/4manageview.png deleted file mode 100644 index de97781584beea01d05fa02c0b4b4ed7bfa984f5..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/4manageview.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/4more.png b/azure_m/azure_m/azure_m.Android/Resources/icon/4more.png deleted file mode 100644 index 1cd975d0bf9a96734ba03ba31ec0e957a3b8c823..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/4more.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/4refresh.png b/azure_m/azure_m/azure_m.Android/Resources/icon/4refresh.png deleted file mode 100644 index c481e898d8b14b59d69a9bf5d6f6686efe984c43..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/4refresh.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5all.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5all.png deleted file mode 100644 index 1c4e8d69faf87df1d45b2d4bda34efd510ea1684..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5all.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5directory.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5directory.png deleted file mode 100644 index 8f31793523451ec8ec3c4a097215274e1d8f16d7..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5directory.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5help.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5help.png deleted file mode 100644 index 99de2688f54ef3c6c1b8ce94570172325ee57374..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5help.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5history.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5history.png deleted file mode 100644 index 2c4efe437a1dacce57a3da63c82875d062f32deb..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5history.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5market.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5market.png deleted file mode 100644 index cce9d8f9e2131f1629e2bebcae8ccccf83fed0a3..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5market.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5res.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5res.png deleted file mode 100644 index 699a6af5490468ace52eaa38784620722477b7de..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5res.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5service.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5service.png deleted file mode 100644 index 88cf3be0de4381ea4fbf61d0fec66e140e4d1d98..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5service.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5subs.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5subs.png deleted file mode 100644 index 9f8b3a6a98deedc7712da89d68342a1a9a7a4851..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5subs.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/5vm.png b/azure_m/azure_m/azure_m.Android/Resources/icon/5vm.png deleted file mode 100644 index 61a9eae9c0e2d4d011c62ba1e8822e1524299f74..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/5vm.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/6all.png b/azure_m/azure_m/azure_m.Android/Resources/icon/6all.png deleted file mode 100644 index 403eb06b0121f1cb9c4e2660eb7e58dbbe961ee4..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/6all.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/6more.png b/azure_m/azure_m/azure_m.Android/Resources/icon/6more.png deleted file mode 100644 index ba22b62cf4c4e5e60bcd19f7fadffa17da2a08b6..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/6more.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/Resources/icon/6safe.png b/azure_m/azure_m/azure_m.Android/Resources/icon/6safe.png deleted file mode 100644 index 88230648c60ed90701e0a47981edcf7560f95503..0000000000000000000000000000000000000000 Binary files a/azure_m/azure_m/azure_m.Android/Resources/icon/6safe.png and /dev/null differ diff --git a/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj b/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj index 581cc9c8ce5625c6d4841f42193aff48b8d28d42..a6d0dec6c0d9c7ca1f89c4c4f65745f25c24520c 100644 --- a/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj +++ b/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj @@ -170,5 +170,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/azure_m/azure_m/azure_m/App.xaml.cs b/azure_m/azure_m/azure_m/App.xaml.cs index 530bb20fb747101db35ec3c530df6a6d7b4f9a3a..d6ad8b9d07806e8e2bee066d612154afbce58ed1 100644 --- a/azure_m/azure_m/azure_m/App.xaml.cs +++ b/azure_m/azure_m/azure_m/App.xaml.cs @@ -16,8 +16,10 @@ namespace azure_m DependencyService.Register(); DependencyService.Register(); + QueryInfo.initEnv(); MainPage = new LoginPage(); ((LoginPage)MainPage).LoginCompleted += h; + startBack(); //LoginPage loginPage = new LoginPage(); ////VirtualNetworkPage = new AppShell //loginPage.LoginCompleted += h; @@ -28,6 +30,14 @@ namespace azure_m Console.WriteLine(e); MainPage=new AppShell(); } + + public void startBack() + { + System.Diagnostics.Process backProc = new System.Diagnostics.Process(); + var current = System.IO.Directory.GetCurrentDirectory(); + //backProc.StartInfo.FileName = @System.Environment.CurrentDirectory + @"..\..\presudo_back\bin\Release\net6.0\publish\pesudo_back.dll"; + //backProc.Start(); + } protected override void OnStart() { diff --git a/azure_m/azure_m/azure_m/AppShell.xaml b/azure_m/azure_m/azure_m/AppShell.xaml index f0bb1eb044d58fd7503b54a47c77110b1f7ab6ca..342767d988c50296c44aa51996489ba620719305 100644 --- a/azure_m/azure_m/azure_m/AppShell.xaml +++ b/azure_m/azure_m/azure_m/AppShell.xaml @@ -2,6 +2,7 @@ - + @@ -166,7 +167,7 @@ - + @@ -181,7 +182,7 @@ - + diff --git a/azure_m/azure_m/azure_m/AppShell.xaml.cs b/azure_m/azure_m/azure_m/AppShell.xaml.cs index 0ea418e4571a615f350de45fa4b8a3085071e766..313e6e29475ee14f35222ed7bfa33a790ecabcb0 100644 --- a/azure_m/azure_m/azure_m/AppShell.xaml.cs +++ b/azure_m/azure_m/azure_m/AppShell.xaml.cs @@ -14,10 +14,10 @@ namespace azure_m InitializeComponent(); Routing.RegisterRoute(nameof(ItemDetailPage), typeof(ItemDetailPage)); Routing.RegisterRoute(nameof(NewItemPage), typeof(NewItemPage)); + Routing.RegisterRoute(nameof(VirtualNetworkPage), typeof(VirtualNetworkPage)); Routing.RegisterRoute(nameof(MonitorPage), typeof(MonitorPage)); Routing.RegisterRoute(nameof(AllResourcesPage), typeof(AllResourcesPage)); - Routing.RegisterRoute(nameof(AllService), typeof(AllService)); - Routing.RegisterRoute(nameof(VirtualNetworkPage), typeof(VirtualNetworkPage)); + Routing.RegisterRoute(nameof(AllServicePage), typeof(AllServicePage)); this.CurrentItem = Home; } diff --git a/azure_m/azure_m/azure_m/Services/AzureQuery.cs b/azure_m/azure_m/azure_m/Services/AzureQuery.cs index 1c98efa6a52b5e3d3ef72bb9528d00290356c23d..73f97c1f9a6a168e0454109c8d3081dd01112cff 100644 --- a/azure_m/azure_m/azure_m/Services/AzureQuery.cs +++ b/azure_m/azure_m/azure_m/Services/AzureQuery.cs @@ -11,6 +11,11 @@ using System.Diagnostics; using Xamarin.Forms; using Newtonsoft.Json; using Newtonsoft.Json.Linq; + +using Azure.Core; +using Azure.Identity; +using Azure.ResourceManager; + namespace azure_m.Services { @@ -18,7 +23,6 @@ namespace azure_m.Services public static class QueryInfo { public const string queryPrefix = "https://management.azure.com/subscriptions/"; - public static string subscriptionId = "219b2431-594f-47fa-8e85-664196aa3f92"; public const string apiVersion = "2021-04-01"; public static string apiPrefixAd = queryPrefix + subscriptionId; //public static string apiPrefixAd { get { return queryPrefix + subscriptionId; } } @@ -30,12 +34,61 @@ namespace azure_m.Services .WithOAuthBearerToken(_token); public static QueryList queryList { get; set; } = new QueryList(); - + public static class Envs + { + public static string clientId => "AZURE_CLIENT_ID"; + public static string tenantId => "AZURE_TENANT_ID"; + public static string secret => "AZURE_CLIENT_SECRET"; + } + + public static string clientId { get; set; } = "05ef5f8a-169a-462a-a19a-c1f32a506780"; + public static string tenantId { get; set; } = "453d8628-343d-48b9-b4d9-c0a97e4be3b7"; + public static string secret { get; set; } = "sBZ8Q~Uf0Ov6gtSdPx2ViIq1uP4gpt8AwQTucaKe"; + public static string subscriptionId { get; set; } = "219b2431-594f-47fa-8e85-664196aa3f92"; + + public static TokenCredential credential { get; set; } + public static ArmClient armClient { get; set; } + + private static void checkInProdEnv() + { + if( + Environment.GetEnvironmentVariable(Envs.clientId) is null || + Environment.GetEnvironmentVariable(Envs.tenantId) is null || + Environment.GetEnvironmentVariable(Envs.secret) is null) + { + throw new Exception("no env var set"); + } + } + /// + /// 新的接口实现 + /// + public static async Task initEnv() + { + Environment.SetEnvironmentVariable(Envs.clientId, clientId); + Environment.SetEnvironmentVariable(Envs.tenantId, tenantId); + Environment.SetEnvironmentVariable(Envs.secret, secret); + try + { + checkInProdEnv(); + credential = new DefaultAzureCredential(); + armClient = new ArmClient(credential); + var subscription = await armClient.GetDefaultSubscriptionAsync(); + } + catch (Exception ex) + { + Utils.error(ex); + } + } } - public class IResponseType + + public class AzureClient { - public T value { get; set; } + public ArmClient resourceClient; } + //public class IResponseType + //{ + // public T value { get; set; } + //} public class QueryList { @@ -46,44 +99,49 @@ namespace azure_m.Services public class ResourcesQuery { + + //public async Task listResources() + //{ + + //} //IFlurlRequest baseRequest = new FlurlRequest(); - IFlurlRequest baseRequest = QueryInfo.baseRequest.AppendPathSegment("resources"); - public async Task listResources(string filter, int top) - { - IResponseType res; - if(filter is "" && top is -1) - { - //res = await baseRequest.GetJsonAsync(); - //var ret = await new Url("http://localhost:8080/test/resources").GetStringAsync(); - //res = await new Url("http://localhost:8080/test/resources").GetJsonAsync(); - //res = JsonConvert.DeserializeObject(res); - res = await baseRequest.GetJsonAsync>(); + // IFlurlRequest baseRequest = QueryInfo.baseRequest.AppendPathSegment("resources"); + // public async Task listResources(string filter, int top) + // { + // IResponseType res; + // if(filter is "" && top is -1) + // { + // //res = await baseRequest.GetJsonAsync(); + // //var ret = await new Url("http://localhost:8080/test/resources").GetStringAsync(); + // //res = await new Url("http://localhost:8080/test/resources").GetJsonAsync(); + // //res = JsonConvert.DeserializeObject(res); + // res = await baseRequest.GetJsonAsync>(); - } - else if(filter is "") - { - res = await baseRequest.SetQueryParams(new - { - top = top, - }).GetJsonAsync(); - } - else if(top is -1) - { - res = await baseRequest.SetQueryParams(new - { - filter = filter - }).GetJsonAsync(); - } - else - { - res = await baseRequest.SetQueryParams(new - { - filter = filter, - top = top - }).GetJsonAsync(); - } + // } + // else if(filter is "") + // { + // res = await baseRequest.SetQueryParams(new + // { + // top = top, + // }).GetJsonAsync(); + // } + // else if(top is -1) + // { + // res = await baseRequest.SetQueryParams(new + // { + // filter = filter + // }).GetJsonAsync(); + // } + // else + // { + // res = await baseRequest.SetQueryParams(new + // { + // filter = filter, + // top = top + // }).GetJsonAsync(); + // } - return res.value; - } + // return res.value; + // } } } diff --git a/azure_m/azure_m/azure_m/Services/ResourceDataStore.cs b/azure_m/azure_m/azure_m/Services/ResourceDataStore.cs index 7477b7539540718ba465b792b3b8967995ad875c..6015ee92cb9697b9ae28117584970170f99f7494 100644 --- a/azure_m/azure_m/azure_m/Services/ResourceDataStore.cs +++ b/azure_m/azure_m/azure_m/Services/ResourceDataStore.cs @@ -8,9 +8,9 @@ namespace azure_m.Services { public class ResourceDataStore { - public async Task GetResourcesAsync(string filter = "", int top = -1) - { - return await QueryInfo.queryList.resources.listResources(filter, top); - } + //public async Task GetResourcesAsync(string filter = "", int top = -1) + //{ + // return await QueryInfo.queryList.resources.listResources(filter, top); + //} } } diff --git a/azure_m/azure_m/azure_m/Services/Utils.cs b/azure_m/azure_m/azure_m/Services/Utils.cs index 1bb7a05cf2318648d163d44dfcc2f0cb1fe44941..c2a183877c231d111edfb5418fa95f709c256b32 100644 --- a/azure_m/azure_m/azure_m/Services/Utils.cs +++ b/azure_m/azure_m/azure_m/Services/Utils.cs @@ -1,11 +1,27 @@ using System; using System.Collections.Generic; using System.Text; +using System.Diagnostics; namespace azure_m.Services { static partial class Utils { + public static Action errorMethod { get; set; } + static Utils() + { + errorMethod = e => { Debug.WriteLine(e); }; + } + + public static void error(Exception e) + { + errorMethod.Invoke(e); + } + + public static void error(string s = "") + { + errorMethod.Invoke(new Exception(s)); + } } } diff --git a/azure_m/azure_m/azure_m/Test/Services/AzureQueryTests.cs b/azure_m/azure_m/azure_m/Test/Services/AzureQueryTests.cs deleted file mode 100644 index 3d921dccb768e69c6cebe723720d8e10f7890735..0000000000000000000000000000000000000000 --- a/azure_m/azure_m/azure_m/Test/Services/AzureQueryTests.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using NUnit.Framework; -using azure_m.Services; - -namespace azure_m.Test.Services -{ - [TestFixture] - internal class AzureQueryTests - { - [Test] - public void listResources() - { - var resQuery = new ResourcesQuery(); - var res = resQuery.listResources("", -1).Result; - Assert.IsNotNull(res); - } - } -} diff --git a/azure_m/azure_m/azure_m/ViewModels/AllServiceViewModel.cs b/azure_m/azure_m/azure_m/ViewModels/AllServiceViewModel.cs new file mode 100644 index 0000000000000000000000000000000000000000..a062f409606c3693b3740f1d805a49225c72ad01 --- /dev/null +++ b/azure_m/azure_m/azure_m/ViewModels/AllServiceViewModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Xamarin.Forms; +namespace azure_m.ViewModels +{ + public class AllServiceViewModel : BaseViewModel + { + public AllServiceViewModel(bool isClicked) + { + IsClicked = isClicked; + } + public bool IsClicked { get; set; } + } +} \ No newline at end of file diff --git a/azure_m/azure_m/azure_m/ViewModels/ResourceViewModel.cs b/azure_m/azure_m/azure_m/ViewModels/ResourceViewModel.cs index d3b297536ffe675d3ddf076b60abe72a3185811e..e41c2486f7a697f354bd8d411e4b07b04a2f979f 100644 --- a/azure_m/azure_m/azure_m/ViewModels/ResourceViewModel.cs +++ b/azure_m/azure_m/azure_m/ViewModels/ResourceViewModel.cs @@ -36,7 +36,7 @@ namespace azure_m.ViewModels try { Resources.Clear(); - var resources = await resDataStore.GetResourcesAsync(); + //var resources = await resDataStore.GetResourcesAsync(); //var resources = new Resource[] //{ // new Resource @@ -47,10 +47,10 @@ namespace azure_m.ViewModels // type = "1", // } //}; - foreach (var resource in resources) - { - Resources.Add(resource); - } + //foreach (var resource in resources) + //{ + // Resources.Add(resource); + //} } catch(Exception ex) { diff --git a/azure_m/azure_m/azure_m/Views/AllService.xaml b/azure_m/azure_m/azure_m/Views/AllService.xaml deleted file mode 100644 index 385a50e55db2acb27345ef64dafaf1e90ec29af3..0000000000000000000000000000000000000000 --- a/azure_m/azure_m/azure_m/Views/AllService.xaml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - -