diff --git a/wgshare/android/gradle/wrapper/gradle-wrapper.properties b/wgshare/android/gradle/wrapper/gradle-wrapper.properties index 7bb2df6..7be9ee2 100644 --- a/wgshare/android/gradle/wrapper/gradle-wrapper.properties +++ b/wgshare/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https://mirrors.aliyun.com/macports/distfiles/gradle/gradle-7.6-all.zip diff --git a/wgshare/android/settings.gradle b/wgshare/android/settings.gradle index b9e43bd..536165d 100644 --- a/wgshare/android/settings.gradle +++ b/wgshare/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false - id "org.jetbrains.kotlin.android" version "1.8.22" apply false + id "com.android.application" version "7.3.0" apply false + id "org.jetbrains.kotlin.android" version "1.7.10" apply false } include ":app" diff --git a/wgshare/assets/images/1.5x/home_icon.png b/wgshare/assets/images/1.5x/home_icon.png deleted file mode 100644 index 7cc3f25..0000000 Binary files a/wgshare/assets/images/1.5x/home_icon.png and /dev/null differ diff --git a/wgshare/assets/images/1.5x/home_no_active_icon.png b/wgshare/assets/images/1.5x/home_no_active_icon.png deleted file mode 100644 index 0bb4066..0000000 Binary files a/wgshare/assets/images/1.5x/home_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/1.5x/mine_icon.png b/wgshare/assets/images/1.5x/mine_icon.png deleted file mode 100644 index d097fe6..0000000 Binary files a/wgshare/assets/images/1.5x/mine_icon.png and /dev/null differ diff --git a/wgshare/assets/images/1.5x/mine_no_active_icon.png b/wgshare/assets/images/1.5x/mine_no_active_icon.png deleted file mode 100644 index 0ae2b7f..0000000 Binary files a/wgshare/assets/images/1.5x/mine_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/2.0x/home_icon.png b/wgshare/assets/images/2.0x/home_icon.png deleted file mode 100644 index 9c7f464..0000000 Binary files a/wgshare/assets/images/2.0x/home_icon.png and /dev/null differ diff --git a/wgshare/assets/images/2.0x/home_index_select_n.png b/wgshare/assets/images/2.0x/home_index_select_n.png new file mode 100644 index 0000000..43567b6 Binary files /dev/null and b/wgshare/assets/images/2.0x/home_index_select_n.png differ diff --git a/wgshare/assets/images/2.0x/home_index_select_y.png b/wgshare/assets/images/2.0x/home_index_select_y.png new file mode 100644 index 0000000..db41510 Binary files /dev/null and b/wgshare/assets/images/2.0x/home_index_select_y.png differ diff --git a/wgshare/assets/images/2.0x/home_no_active_icon.png b/wgshare/assets/images/2.0x/home_no_active_icon.png deleted file mode 100644 index c47c032..0000000 Binary files a/wgshare/assets/images/2.0x/home_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/2.0x/home_user_select_n.png b/wgshare/assets/images/2.0x/home_user_select_n.png new file mode 100644 index 0000000..6f0a218 Binary files /dev/null and b/wgshare/assets/images/2.0x/home_user_select_n.png differ diff --git a/wgshare/assets/images/2.0x/home_user_select_y.png b/wgshare/assets/images/2.0x/home_user_select_y.png new file mode 100644 index 0000000..747a0e5 Binary files /dev/null and b/wgshare/assets/images/2.0x/home_user_select_y.png differ diff --git a/wgshare/assets/images/2.0x/index_copy.png b/wgshare/assets/images/2.0x/index_copy.png new file mode 100644 index 0000000..45d2dd7 Binary files /dev/null and b/wgshare/assets/images/2.0x/index_copy.png differ diff --git a/wgshare/assets/images/2.0x/index_persons.png b/wgshare/assets/images/2.0x/index_persons.png new file mode 100644 index 0000000..c2dea1a Binary files /dev/null and b/wgshare/assets/images/2.0x/index_persons.png differ diff --git a/wgshare/assets/images/2.0x/index_right.png b/wgshare/assets/images/2.0x/index_right.png new file mode 100644 index 0000000..fb29a10 Binary files /dev/null and b/wgshare/assets/images/2.0x/index_right.png differ diff --git a/wgshare/assets/images/2.0x/login_agreement_select_n.png b/wgshare/assets/images/2.0x/login_agreement_select_n.png new file mode 100644 index 0000000..4b32ef3 Binary files /dev/null and b/wgshare/assets/images/2.0x/login_agreement_select_n.png differ diff --git a/wgshare/assets/images/2.0x/login_agreement_select_y.png b/wgshare/assets/images/2.0x/login_agreement_select_y.png new file mode 100644 index 0000000..540e3a7 Binary files /dev/null and b/wgshare/assets/images/2.0x/login_agreement_select_y.png differ diff --git a/wgshare/assets/images/2.0x/login_bg.png b/wgshare/assets/images/2.0x/login_bg.png new file mode 100644 index 0000000..ad5548e Binary files /dev/null and b/wgshare/assets/images/2.0x/login_bg.png differ diff --git a/wgshare/assets/images/2.0x/login_tab_left_select_n.png b/wgshare/assets/images/2.0x/login_tab_left_select_n.png new file mode 100644 index 0000000..927fff9 Binary files /dev/null and b/wgshare/assets/images/2.0x/login_tab_left_select_n.png differ diff --git a/wgshare/assets/images/2.0x/login_tab_left_select_y.png b/wgshare/assets/images/2.0x/login_tab_left_select_y.png new file mode 100644 index 0000000..1f91774 Binary files /dev/null and b/wgshare/assets/images/2.0x/login_tab_left_select_y.png differ diff --git a/wgshare/assets/images/2.0x/login_tab_right_select_n.png b/wgshare/assets/images/2.0x/login_tab_right_select_n.png new file mode 100644 index 0000000..a47c746 Binary files /dev/null and b/wgshare/assets/images/2.0x/login_tab_right_select_n.png differ diff --git a/wgshare/assets/images/2.0x/login_tab_right_select_y.png b/wgshare/assets/images/2.0x/login_tab_right_select_y.png new file mode 100644 index 0000000..8e9cff5 Binary files /dev/null and b/wgshare/assets/images/2.0x/login_tab_right_select_y.png differ diff --git a/wgshare/assets/images/2.0x/logo.png b/wgshare/assets/images/2.0x/logo.png new file mode 100644 index 0000000..9245fbb Binary files /dev/null and b/wgshare/assets/images/2.0x/logo.png differ diff --git a/wgshare/assets/images/2.0x/logo_title.png b/wgshare/assets/images/2.0x/logo_title.png new file mode 100644 index 0000000..8e280e5 Binary files /dev/null and b/wgshare/assets/images/2.0x/logo_title.png differ diff --git a/wgshare/assets/images/2.0x/meeting_leave.png b/wgshare/assets/images/2.0x/meeting_leave.png new file mode 100644 index 0000000..2e494ce Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_leave.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_audio.png b/wgshare/assets/images/2.0x/meeting_main_audio.png new file mode 100644 index 0000000..fc6b34b Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_audio.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_camera_default.png b/wgshare/assets/images/2.0x/meeting_main_camera_default.png new file mode 100644 index 0000000..fd5fb9f Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_camera_default.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_camera_open.png b/wgshare/assets/images/2.0x/meeting_main_camera_open.png new file mode 100644 index 0000000..ef17b90 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_camera_open.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_chat.png b/wgshare/assets/images/2.0x/meeting_main_chat.png new file mode 100644 index 0000000..87fa200 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_chat.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_close_permission.png b/wgshare/assets/images/2.0x/meeting_main_close_permission.png new file mode 100644 index 0000000..d332886 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_close_permission.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_copy.png b/wgshare/assets/images/2.0x/meeting_main_copy.png new file mode 100644 index 0000000..0302552 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_copy.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_down.png b/wgshare/assets/images/2.0x/meeting_main_down.png new file mode 100644 index 0000000..78bef1f Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_down.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_hang_up.png b/wgshare/assets/images/2.0x/meeting_main_hang_up.png new file mode 100644 index 0000000..181e32a Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_hang_up.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_info_close.png b/wgshare/assets/images/2.0x/meeting_main_info_close.png new file mode 100644 index 0000000..be12448 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_info_close.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_member_default.png b/wgshare/assets/images/2.0x/meeting_main_member_default.png new file mode 100644 index 0000000..7ba1a9b Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_member_default.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_microphone_close.png b/wgshare/assets/images/2.0x/meeting_main_microphone_close.png new file mode 100644 index 0000000..2fb8865 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_microphone_close.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_microphone_default.png b/wgshare/assets/images/2.0x/meeting_main_microphone_default.png new file mode 100644 index 0000000..11fadef Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_microphone_default.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_microphone_mute.png b/wgshare/assets/images/2.0x/meeting_main_microphone_mute.png new file mode 100644 index 0000000..1f7aa78 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_microphone_mute.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_more_default.png b/wgshare/assets/images/2.0x/meeting_main_more_default.png new file mode 100644 index 0000000..e98108d Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_more_default.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_narrow.png b/wgshare/assets/images/2.0x/meeting_main_narrow.png new file mode 100644 index 0000000..a5aba27 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_narrow.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_network_normal.png b/wgshare/assets/images/2.0x/meeting_main_network_normal.png new file mode 100644 index 0000000..c1a2ded Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_network_normal.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_own.png b/wgshare/assets/images/2.0x/meeting_main_own.png new file mode 100644 index 0000000..eb87b6a Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_own.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_query_member.png b/wgshare/assets/images/2.0x/meeting_main_query_member.png new file mode 100644 index 0000000..347aef8 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_query_member.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_rotate_camera.png b/wgshare/assets/images/2.0x/meeting_main_rotate_camera.png new file mode 100644 index 0000000..21df031 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_rotate_camera.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_share_currently.png b/wgshare/assets/images/2.0x/meeting_main_share_currently.png new file mode 100644 index 0000000..5770bf0 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_share_currently.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_share_default.png b/wgshare/assets/images/2.0x/meeting_main_share_default.png new file mode 100644 index 0000000..12daceb Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_share_default.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_share_open.png b/wgshare/assets/images/2.0x/meeting_main_share_open.png new file mode 100644 index 0000000..68088ad Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_share_open.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_speak1.png b/wgshare/assets/images/2.0x/meeting_main_speak1.png new file mode 100644 index 0000000..6b087cf Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_speak1.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_speak2.png b/wgshare/assets/images/2.0x/meeting_main_speak2.png new file mode 100644 index 0000000..050920a Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_speak2.png differ diff --git a/wgshare/assets/images/2.0x/meeting_main_upper.png b/wgshare/assets/images/2.0x/meeting_main_upper.png new file mode 100644 index 0000000..0e6f934 Binary files /dev/null and b/wgshare/assets/images/2.0x/meeting_main_upper.png differ diff --git a/wgshare/assets/images/2.0x/mine_icon.png b/wgshare/assets/images/2.0x/mine_icon.png deleted file mode 100644 index 0b5128d..0000000 Binary files a/wgshare/assets/images/2.0x/mine_icon.png and /dev/null differ diff --git a/wgshare/assets/images/2.0x/mine_no_active_icon.png b/wgshare/assets/images/2.0x/mine_no_active_icon.png deleted file mode 100644 index 88ed8ff..0000000 Binary files a/wgshare/assets/images/2.0x/mine_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/2.0x/user_right.png b/wgshare/assets/images/2.0x/user_right.png new file mode 100644 index 0000000..b27819d Binary files /dev/null and b/wgshare/assets/images/2.0x/user_right.png differ diff --git a/wgshare/assets/images/3.0x/home_icon.png b/wgshare/assets/images/3.0x/home_icon.png deleted file mode 100644 index 930b29b..0000000 Binary files a/wgshare/assets/images/3.0x/home_icon.png and /dev/null differ diff --git a/wgshare/assets/images/3.0x/home_index_select_n.png b/wgshare/assets/images/3.0x/home_index_select_n.png new file mode 100644 index 0000000..f103995 Binary files /dev/null and b/wgshare/assets/images/3.0x/home_index_select_n.png differ diff --git a/wgshare/assets/images/3.0x/home_index_select_y.png b/wgshare/assets/images/3.0x/home_index_select_y.png new file mode 100644 index 0000000..733f811 Binary files /dev/null and b/wgshare/assets/images/3.0x/home_index_select_y.png differ diff --git a/wgshare/assets/images/3.0x/home_no_active_icon.png b/wgshare/assets/images/3.0x/home_no_active_icon.png deleted file mode 100644 index b65dfb4..0000000 Binary files a/wgshare/assets/images/3.0x/home_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/3.0x/home_user_select_n.png b/wgshare/assets/images/3.0x/home_user_select_n.png new file mode 100644 index 0000000..cec62f7 Binary files /dev/null and b/wgshare/assets/images/3.0x/home_user_select_n.png differ diff --git a/wgshare/assets/images/3.0x/home_user_select_y.png b/wgshare/assets/images/3.0x/home_user_select_y.png new file mode 100644 index 0000000..a11c619 Binary files /dev/null and b/wgshare/assets/images/3.0x/home_user_select_y.png differ diff --git a/wgshare/assets/images/3.0x/index_copy.png b/wgshare/assets/images/3.0x/index_copy.png new file mode 100644 index 0000000..f8fcd42 Binary files /dev/null and b/wgshare/assets/images/3.0x/index_copy.png differ diff --git a/wgshare/assets/images/3.0x/index_persons.png b/wgshare/assets/images/3.0x/index_persons.png new file mode 100644 index 0000000..821ae03 Binary files /dev/null and b/wgshare/assets/images/3.0x/index_persons.png differ diff --git a/wgshare/assets/images/3.0x/index_right.png b/wgshare/assets/images/3.0x/index_right.png new file mode 100644 index 0000000..c424d62 Binary files /dev/null and b/wgshare/assets/images/3.0x/index_right.png differ diff --git a/wgshare/assets/images/3.0x/login_agreement_select_n.png b/wgshare/assets/images/3.0x/login_agreement_select_n.png new file mode 100644 index 0000000..9a33400 Binary files /dev/null and b/wgshare/assets/images/3.0x/login_agreement_select_n.png differ diff --git a/wgshare/assets/images/3.0x/login_agreement_select_y.png b/wgshare/assets/images/3.0x/login_agreement_select_y.png new file mode 100644 index 0000000..f1621be Binary files /dev/null and b/wgshare/assets/images/3.0x/login_agreement_select_y.png differ diff --git a/wgshare/assets/images/3.0x/login_bg.png b/wgshare/assets/images/3.0x/login_bg.png new file mode 100644 index 0000000..c06f552 Binary files /dev/null and b/wgshare/assets/images/3.0x/login_bg.png differ diff --git a/wgshare/assets/images/3.0x/login_tab_left_select_n.png b/wgshare/assets/images/3.0x/login_tab_left_select_n.png new file mode 100644 index 0000000..746db4a Binary files /dev/null and b/wgshare/assets/images/3.0x/login_tab_left_select_n.png differ diff --git a/wgshare/assets/images/3.0x/login_tab_left_select_y.png b/wgshare/assets/images/3.0x/login_tab_left_select_y.png new file mode 100644 index 0000000..2c73f4d Binary files /dev/null and b/wgshare/assets/images/3.0x/login_tab_left_select_y.png differ diff --git a/wgshare/assets/images/3.0x/login_tab_right_select_n.png b/wgshare/assets/images/3.0x/login_tab_right_select_n.png new file mode 100644 index 0000000..6e00bc8 Binary files /dev/null and b/wgshare/assets/images/3.0x/login_tab_right_select_n.png differ diff --git a/wgshare/assets/images/3.0x/login_tab_right_select_y.png b/wgshare/assets/images/3.0x/login_tab_right_select_y.png new file mode 100644 index 0000000..a901297 Binary files /dev/null and b/wgshare/assets/images/3.0x/login_tab_right_select_y.png differ diff --git a/wgshare/assets/images/3.0x/logo.png b/wgshare/assets/images/3.0x/logo.png new file mode 100644 index 0000000..10926fb Binary files /dev/null and b/wgshare/assets/images/3.0x/logo.png differ diff --git a/wgshare/assets/images/3.0x/logo_title.png b/wgshare/assets/images/3.0x/logo_title.png new file mode 100644 index 0000000..7d7181f Binary files /dev/null and b/wgshare/assets/images/3.0x/logo_title.png differ diff --git a/wgshare/assets/images/3.0x/meeting_leave.png b/wgshare/assets/images/3.0x/meeting_leave.png new file mode 100644 index 0000000..4094d78 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_leave.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_audio.png b/wgshare/assets/images/3.0x/meeting_main_audio.png new file mode 100644 index 0000000..05cdc14 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_audio.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_camera_default.png b/wgshare/assets/images/3.0x/meeting_main_camera_default.png new file mode 100644 index 0000000..7cdfdc5 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_camera_default.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_camera_open.png b/wgshare/assets/images/3.0x/meeting_main_camera_open.png new file mode 100644 index 0000000..5fcb625 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_camera_open.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_chat.png b/wgshare/assets/images/3.0x/meeting_main_chat.png new file mode 100644 index 0000000..c040c1c Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_chat.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_close_permission.png b/wgshare/assets/images/3.0x/meeting_main_close_permission.png new file mode 100644 index 0000000..0bdfa65 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_close_permission.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_copy.png b/wgshare/assets/images/3.0x/meeting_main_copy.png new file mode 100644 index 0000000..d9f21b5 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_copy.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_down.png b/wgshare/assets/images/3.0x/meeting_main_down.png new file mode 100644 index 0000000..3589066 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_down.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_hang_up.png b/wgshare/assets/images/3.0x/meeting_main_hang_up.png new file mode 100644 index 0000000..ec46e18 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_hang_up.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_info_close.png b/wgshare/assets/images/3.0x/meeting_main_info_close.png new file mode 100644 index 0000000..d8c401a Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_info_close.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_member_default.png b/wgshare/assets/images/3.0x/meeting_main_member_default.png new file mode 100644 index 0000000..237cc34 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_member_default.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_microphone_close.png b/wgshare/assets/images/3.0x/meeting_main_microphone_close.png new file mode 100644 index 0000000..f8176d0 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_microphone_close.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_microphone_default.png b/wgshare/assets/images/3.0x/meeting_main_microphone_default.png new file mode 100644 index 0000000..c8e3f90 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_microphone_default.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_microphone_mute.png b/wgshare/assets/images/3.0x/meeting_main_microphone_mute.png new file mode 100644 index 0000000..11c29b2 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_microphone_mute.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_more_default.png b/wgshare/assets/images/3.0x/meeting_main_more_default.png new file mode 100644 index 0000000..6c3520d Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_more_default.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_narrow.png b/wgshare/assets/images/3.0x/meeting_main_narrow.png new file mode 100644 index 0000000..5d13439 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_narrow.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_network_normal.png b/wgshare/assets/images/3.0x/meeting_main_network_normal.png new file mode 100644 index 0000000..448d2f3 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_network_normal.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_own.png b/wgshare/assets/images/3.0x/meeting_main_own.png new file mode 100644 index 0000000..3e31334 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_own.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_query_member.png b/wgshare/assets/images/3.0x/meeting_main_query_member.png new file mode 100644 index 0000000..71070c2 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_query_member.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_rotate_camera.png b/wgshare/assets/images/3.0x/meeting_main_rotate_camera.png new file mode 100644 index 0000000..1d56c34 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_rotate_camera.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_share_currently.png b/wgshare/assets/images/3.0x/meeting_main_share_currently.png new file mode 100644 index 0000000..096532b Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_share_currently.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_share_default.png b/wgshare/assets/images/3.0x/meeting_main_share_default.png new file mode 100644 index 0000000..11a8990 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_share_default.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_share_open.png b/wgshare/assets/images/3.0x/meeting_main_share_open.png new file mode 100644 index 0000000..a653d36 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_share_open.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_speak1.png b/wgshare/assets/images/3.0x/meeting_main_speak1.png new file mode 100644 index 0000000..b416daf Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_speak1.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_speak2.png b/wgshare/assets/images/3.0x/meeting_main_speak2.png new file mode 100644 index 0000000..f6263a0 Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_speak2.png differ diff --git a/wgshare/assets/images/3.0x/meeting_main_upper.png b/wgshare/assets/images/3.0x/meeting_main_upper.png new file mode 100644 index 0000000..204307d Binary files /dev/null and b/wgshare/assets/images/3.0x/meeting_main_upper.png differ diff --git a/wgshare/assets/images/3.0x/mine_icon.png b/wgshare/assets/images/3.0x/mine_icon.png deleted file mode 100644 index ee10b90..0000000 Binary files a/wgshare/assets/images/3.0x/mine_icon.png and /dev/null differ diff --git a/wgshare/assets/images/3.0x/mine_no_active_icon.png b/wgshare/assets/images/3.0x/mine_no_active_icon.png deleted file mode 100644 index e90d2dc..0000000 Binary files a/wgshare/assets/images/3.0x/mine_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/3.0x/user_right.png b/wgshare/assets/images/3.0x/user_right.png new file mode 100644 index 0000000..1d5c603 Binary files /dev/null and b/wgshare/assets/images/3.0x/user_right.png differ diff --git a/wgshare/assets/images/4.0x/home_icon.png b/wgshare/assets/images/4.0x/home_icon.png deleted file mode 100644 index d44c7ed..0000000 Binary files a/wgshare/assets/images/4.0x/home_icon.png and /dev/null differ diff --git a/wgshare/assets/images/4.0x/home_no_active_icon.png b/wgshare/assets/images/4.0x/home_no_active_icon.png deleted file mode 100644 index 6252971..0000000 Binary files a/wgshare/assets/images/4.0x/home_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/4.0x/mine_icon.png b/wgshare/assets/images/4.0x/mine_icon.png deleted file mode 100644 index 5d03324..0000000 Binary files a/wgshare/assets/images/4.0x/mine_icon.png and /dev/null differ diff --git a/wgshare/assets/images/4.0x/mine_no_active_icon.png b/wgshare/assets/images/4.0x/mine_no_active_icon.png deleted file mode 100644 index 3ff1bbd..0000000 Binary files a/wgshare/assets/images/4.0x/mine_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/home_icon.png b/wgshare/assets/images/home_icon.png deleted file mode 100644 index 552fab4..0000000 Binary files a/wgshare/assets/images/home_icon.png and /dev/null differ diff --git a/wgshare/assets/images/home_index_select_n.png b/wgshare/assets/images/home_index_select_n.png new file mode 100644 index 0000000..08877bd Binary files /dev/null and b/wgshare/assets/images/home_index_select_n.png differ diff --git a/wgshare/assets/images/home_index_select_y.png b/wgshare/assets/images/home_index_select_y.png new file mode 100644 index 0000000..bfbcc80 Binary files /dev/null and b/wgshare/assets/images/home_index_select_y.png differ diff --git a/wgshare/assets/images/home_no_active_icon.png b/wgshare/assets/images/home_no_active_icon.png deleted file mode 100644 index bb83100..0000000 Binary files a/wgshare/assets/images/home_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/home_user_select_n.png b/wgshare/assets/images/home_user_select_n.png new file mode 100644 index 0000000..d32387e Binary files /dev/null and b/wgshare/assets/images/home_user_select_n.png differ diff --git a/wgshare/assets/images/home_user_select_y.png b/wgshare/assets/images/home_user_select_y.png new file mode 100644 index 0000000..dd091b7 Binary files /dev/null and b/wgshare/assets/images/home_user_select_y.png differ diff --git a/wgshare/assets/images/index_copy.png b/wgshare/assets/images/index_copy.png new file mode 100644 index 0000000..53de068 Binary files /dev/null and b/wgshare/assets/images/index_copy.png differ diff --git a/wgshare/assets/images/index_persons.png b/wgshare/assets/images/index_persons.png new file mode 100644 index 0000000..ae81db8 Binary files /dev/null and b/wgshare/assets/images/index_persons.png differ diff --git a/wgshare/assets/images/index_right.png b/wgshare/assets/images/index_right.png new file mode 100644 index 0000000..5d0cb23 Binary files /dev/null and b/wgshare/assets/images/index_right.png differ diff --git a/wgshare/assets/images/login_agreement_select_n.png b/wgshare/assets/images/login_agreement_select_n.png new file mode 100644 index 0000000..afeb83c Binary files /dev/null and b/wgshare/assets/images/login_agreement_select_n.png differ diff --git a/wgshare/assets/images/login_agreement_select_y.png b/wgshare/assets/images/login_agreement_select_y.png new file mode 100644 index 0000000..bc0612c Binary files /dev/null and b/wgshare/assets/images/login_agreement_select_y.png differ diff --git a/wgshare/assets/images/login_bg.png b/wgshare/assets/images/login_bg.png new file mode 100644 index 0000000..261a91d Binary files /dev/null and b/wgshare/assets/images/login_bg.png differ diff --git a/wgshare/assets/images/login_tab_left_select_n.png b/wgshare/assets/images/login_tab_left_select_n.png new file mode 100644 index 0000000..c699ea2 Binary files /dev/null and b/wgshare/assets/images/login_tab_left_select_n.png differ diff --git a/wgshare/assets/images/login_tab_left_select_y.png b/wgshare/assets/images/login_tab_left_select_y.png new file mode 100644 index 0000000..2ba758a Binary files /dev/null and b/wgshare/assets/images/login_tab_left_select_y.png differ diff --git a/wgshare/assets/images/login_tab_right_select_n.png b/wgshare/assets/images/login_tab_right_select_n.png new file mode 100644 index 0000000..21457db Binary files /dev/null and b/wgshare/assets/images/login_tab_right_select_n.png differ diff --git a/wgshare/assets/images/login_tab_right_select_y.png b/wgshare/assets/images/login_tab_right_select_y.png new file mode 100644 index 0000000..c958912 Binary files /dev/null and b/wgshare/assets/images/login_tab_right_select_y.png differ diff --git a/wgshare/assets/images/logo.png b/wgshare/assets/images/logo.png new file mode 100644 index 0000000..dfd3e00 Binary files /dev/null and b/wgshare/assets/images/logo.png differ diff --git a/wgshare/assets/images/logo_title.png b/wgshare/assets/images/logo_title.png new file mode 100644 index 0000000..03e16fc Binary files /dev/null and b/wgshare/assets/images/logo_title.png differ diff --git a/wgshare/assets/images/meeting_leave.png b/wgshare/assets/images/meeting_leave.png new file mode 100644 index 0000000..9f46ea4 Binary files /dev/null and b/wgshare/assets/images/meeting_leave.png differ diff --git a/wgshare/assets/images/meeting_main_audio.png b/wgshare/assets/images/meeting_main_audio.png new file mode 100644 index 0000000..eef7f73 Binary files /dev/null and b/wgshare/assets/images/meeting_main_audio.png differ diff --git a/wgshare/assets/images/meeting_main_camera_default.png b/wgshare/assets/images/meeting_main_camera_default.png new file mode 100644 index 0000000..8518fb2 Binary files /dev/null and b/wgshare/assets/images/meeting_main_camera_default.png differ diff --git a/wgshare/assets/images/meeting_main_camera_open.png b/wgshare/assets/images/meeting_main_camera_open.png new file mode 100644 index 0000000..f31d96d Binary files /dev/null and b/wgshare/assets/images/meeting_main_camera_open.png differ diff --git a/wgshare/assets/images/meeting_main_chat.png b/wgshare/assets/images/meeting_main_chat.png new file mode 100644 index 0000000..fc63506 Binary files /dev/null and b/wgshare/assets/images/meeting_main_chat.png differ diff --git a/wgshare/assets/images/meeting_main_close_permission.png b/wgshare/assets/images/meeting_main_close_permission.png new file mode 100644 index 0000000..82f563b Binary files /dev/null and b/wgshare/assets/images/meeting_main_close_permission.png differ diff --git a/wgshare/assets/images/meeting_main_copy.png b/wgshare/assets/images/meeting_main_copy.png new file mode 100644 index 0000000..2197e06 Binary files /dev/null and b/wgshare/assets/images/meeting_main_copy.png differ diff --git a/wgshare/assets/images/meeting_main_down.png b/wgshare/assets/images/meeting_main_down.png new file mode 100644 index 0000000..7f53b7a Binary files /dev/null and b/wgshare/assets/images/meeting_main_down.png differ diff --git a/wgshare/assets/images/meeting_main_hang_up.png b/wgshare/assets/images/meeting_main_hang_up.png new file mode 100644 index 0000000..6a11bfd Binary files /dev/null and b/wgshare/assets/images/meeting_main_hang_up.png differ diff --git a/wgshare/assets/images/meeting_main_info_close.png b/wgshare/assets/images/meeting_main_info_close.png new file mode 100644 index 0000000..f8d88ff Binary files /dev/null and b/wgshare/assets/images/meeting_main_info_close.png differ diff --git a/wgshare/assets/images/meeting_main_member_default.png b/wgshare/assets/images/meeting_main_member_default.png new file mode 100644 index 0000000..5da0b17 Binary files /dev/null and b/wgshare/assets/images/meeting_main_member_default.png differ diff --git a/wgshare/assets/images/meeting_main_microphone_close.png b/wgshare/assets/images/meeting_main_microphone_close.png new file mode 100644 index 0000000..da15095 Binary files /dev/null and b/wgshare/assets/images/meeting_main_microphone_close.png differ diff --git a/wgshare/assets/images/meeting_main_microphone_default.png b/wgshare/assets/images/meeting_main_microphone_default.png new file mode 100644 index 0000000..9b3ac69 Binary files /dev/null and b/wgshare/assets/images/meeting_main_microphone_default.png differ diff --git a/wgshare/assets/images/meeting_main_microphone_mute.png b/wgshare/assets/images/meeting_main_microphone_mute.png new file mode 100644 index 0000000..6592561 Binary files /dev/null and b/wgshare/assets/images/meeting_main_microphone_mute.png differ diff --git a/wgshare/assets/images/meeting_main_more_default.png b/wgshare/assets/images/meeting_main_more_default.png new file mode 100644 index 0000000..35ced52 Binary files /dev/null and b/wgshare/assets/images/meeting_main_more_default.png differ diff --git a/wgshare/assets/images/meeting_main_narrow.png b/wgshare/assets/images/meeting_main_narrow.png new file mode 100644 index 0000000..9079d7e Binary files /dev/null and b/wgshare/assets/images/meeting_main_narrow.png differ diff --git a/wgshare/assets/images/meeting_main_network_normal.png b/wgshare/assets/images/meeting_main_network_normal.png new file mode 100644 index 0000000..88cb7bc Binary files /dev/null and b/wgshare/assets/images/meeting_main_network_normal.png differ diff --git a/wgshare/assets/images/meeting_main_own.png b/wgshare/assets/images/meeting_main_own.png new file mode 100644 index 0000000..17e95c2 Binary files /dev/null and b/wgshare/assets/images/meeting_main_own.png differ diff --git a/wgshare/assets/images/meeting_main_query_member.png b/wgshare/assets/images/meeting_main_query_member.png new file mode 100644 index 0000000..0412c45 Binary files /dev/null and b/wgshare/assets/images/meeting_main_query_member.png differ diff --git a/wgshare/assets/images/meeting_main_rotate_camera.png b/wgshare/assets/images/meeting_main_rotate_camera.png new file mode 100644 index 0000000..b4312ea Binary files /dev/null and b/wgshare/assets/images/meeting_main_rotate_camera.png differ diff --git a/wgshare/assets/images/meeting_main_share_currently.png b/wgshare/assets/images/meeting_main_share_currently.png new file mode 100644 index 0000000..b0e1365 Binary files /dev/null and b/wgshare/assets/images/meeting_main_share_currently.png differ diff --git a/wgshare/assets/images/meeting_main_share_default.png b/wgshare/assets/images/meeting_main_share_default.png new file mode 100644 index 0000000..614056d Binary files /dev/null and b/wgshare/assets/images/meeting_main_share_default.png differ diff --git a/wgshare/assets/images/meeting_main_share_open.png b/wgshare/assets/images/meeting_main_share_open.png new file mode 100644 index 0000000..093dc5a Binary files /dev/null and b/wgshare/assets/images/meeting_main_share_open.png differ diff --git a/wgshare/assets/images/meeting_main_speak1.png b/wgshare/assets/images/meeting_main_speak1.png new file mode 100644 index 0000000..cb54c4a Binary files /dev/null and b/wgshare/assets/images/meeting_main_speak1.png differ diff --git a/wgshare/assets/images/meeting_main_speak2.png b/wgshare/assets/images/meeting_main_speak2.png new file mode 100644 index 0000000..ccc5e31 Binary files /dev/null and b/wgshare/assets/images/meeting_main_speak2.png differ diff --git a/wgshare/assets/images/meeting_main_upper.png b/wgshare/assets/images/meeting_main_upper.png new file mode 100644 index 0000000..1090560 Binary files /dev/null and b/wgshare/assets/images/meeting_main_upper.png differ diff --git a/wgshare/assets/images/mine_icon.png b/wgshare/assets/images/mine_icon.png deleted file mode 100644 index d994529..0000000 Binary files a/wgshare/assets/images/mine_icon.png and /dev/null differ diff --git a/wgshare/assets/images/mine_no_active_icon.png b/wgshare/assets/images/mine_no_active_icon.png deleted file mode 100644 index 36bb380..0000000 Binary files a/wgshare/assets/images/mine_no_active_icon.png and /dev/null differ diff --git a/wgshare/assets/images/user_right.png b/wgshare/assets/images/user_right.png new file mode 100644 index 0000000..0f89fff Binary files /dev/null and b/wgshare/assets/images/user_right.png differ diff --git a/wgshare/lib/common/request/rest_dio.dart b/wgshare/lib/common/request/rest_dio.dart index 2ad57ef..fdcb517 100644 --- a/wgshare/lib/common/request/rest_dio.dart +++ b/wgshare/lib/common/request/rest_dio.dart @@ -113,7 +113,7 @@ class ResponseHandle extends Interceptor { if (statusCode == 401 || flag) { Future.delayed(const Duration(seconds: 2), () { StorageService.to.erase(); - getx.Get.offAllNamed(Routes.login); + getx.Get.offAllNamed(Routes.loginPage); }); } @@ -162,7 +162,7 @@ class TheError extends Interceptor { Future.delayed(const Duration(seconds: 2), () { // UserStore.to.erase(); StorageService.to.erase(); - getx.Get.offAllNamed(Routes.login); + getx.Get.offAllNamed(Routes.loginPage); }); break; case 404: diff --git a/wgshare/lib/main.dart b/wgshare/lib/main.dart index 2c2b61a..59cf536 100644 --- a/wgshare/lib/main.dart +++ b/wgshare/lib/main.dart @@ -79,7 +79,7 @@ class MyApp extends StatelessWidget { //默认专场动画 defaultTransition: Transition.fade, //初始化路由页面 - initialRoute: Routes.startPage, + initialRoute: Routes.loginPage, /// 路由表 getPages: AppPages.pages, diff --git a/wgshare/lib/pages/homePage/home_view.dart b/wgshare/lib/pages/homePage/home_view.dart index cfa1c78..6b0e158 100644 --- a/wgshare/lib/pages/homePage/home_view.dart +++ b/wgshare/lib/pages/homePage/home_view.dart @@ -1,22 +1,24 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:wgshare/common/models/user_info_detail.dart'; import 'package:wgshare/common/store/user_store.dart'; import 'package:wgshare/routes/app_routes.dart'; import 'package:wgshare/utils/my_text.dart'; import 'package:wgshare/utils/storage.dart'; +import '../../utils/color_util.dart'; import 'home_logic.dart'; class HomePage extends StatefulWidget { const HomePage({super.key}); @override - State createState() => _HomePageState(); + State createState() => HomePageState(); } -class _HomePageState extends State with AutomaticKeepAliveClientMixin { +class HomePageState extends State with AutomaticKeepAliveClientMixin { final logic = Get.find(); final state = Get.find().state; Timer? _timer; @@ -32,11 +34,143 @@ class _HomePageState extends State with AutomaticKeepAliveClientMixin @override Widget build(BuildContext context) { super.build(context); - return Scaffold( - backgroundColor: const Color(0xFFE5E7F4), - // appBar:Header('课堂记录'), - body: Center(child: quickText("首页")), + appBar: AppBar( + surfaceTintColor: Colors.white, + elevation: 0, + toolbarHeight: 0, + systemOverlayStyle: const SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + systemNavigationBarColor: Color(0xFF000000), + systemNavigationBarIconBrightness: Brightness.light, + statusBarIconBrightness: Brightness.dark, + statusBarBrightness: Brightness.light, + ), + backgroundColor: Colors.white, + ), + body: Column( + children: [ + Container( + width: double.infinity, + height: 44, + alignment: Alignment.center, + color: Colors.white, + child: Text( + '会议列表', + style: TextStyle( + fontSize: 16, + color: ColorUtil.Color_51_51_51, + fontWeight: FontWeight.w500 + ), + ), + ), + Expanded( + child: Container( + color: ColorUtil.Color_244_244_244, + child: ListView.builder( + itemBuilder: (context, index) { + return Container( + width: double.infinity, + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6)), + color: Colors.white, + ), + margin: EdgeInsets.only(top: index == 0 ? 20 : 12, bottom: index == 19 ? 20 : 0, left: 16, right: 16), + padding: const EdgeInsets.all(12), + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + '奉节中学期末考试分析总结会议', + style: TextStyle( + fontSize: 14, + color: ColorUtil.Color_89_88_88, + fontWeight: FontWeight.w500 + ), + ), + Row( + children: [ + Image.asset( + 'assets/images/index_persons.png', + width: 16, + height: 16, + ), + Text( + '2人', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_177_177_177, + ), + ), + ], + ) + ], + ), + const SizedBox(height: 20), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Text( + '2525353', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_177_177_177, + ), + ), + const SizedBox(width: 6), + Image.asset( + 'assets/images/index_copy.png', + width: 16, + height: 16, + ) + ], + ), + GestureDetector( + child: Container( + width: 78, + height: 30, + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(6)), + color: ColorUtil.Color_85_117_242, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '进入', + style: TextStyle( + fontSize: 12, + color: Colors.white, + ), + ), + Image.asset( + 'assets/images/index_right.png', + width: 16, + height: 16, + ) + ], + ), + ), + onTap: (){ + // Navigator.of(context).push(MaterialPageRoute(builder: (context) => MeetingMainPage())); + }, + ) + ], + ) + ], + ), + ); + }, + itemCount: 20, + ), + ), + ) + ], + ) ); } diff --git a/wgshare/lib/pages/loginPage/login_logic.dart b/wgshare/lib/pages/loginPage/login_logic.dart index 7551449..f0fbc31 100644 --- a/wgshare/lib/pages/loginPage/login_logic.dart +++ b/wgshare/lib/pages/loginPage/login_logic.dart @@ -6,6 +6,16 @@ import 'login_state.dart'; class LoginLogic extends GetxController with RequestToolMixin { final LoginState state = LoginState(); + /// 改变页面状态 + void changePageState(int pageState){ + state.pageState.value = pageState; + } + + /// 改变勾选协议状态 + void changeAgreementState(int checkAgreementState){ + state.checkAgreementState.value = checkAgreementState; + } + @override void dispose() { super.dispose(); diff --git a/wgshare/lib/pages/loginPage/login_state.dart b/wgshare/lib/pages/loginPage/login_state.dart index 2eb72c6..89c7175 100644 --- a/wgshare/lib/pages/loginPage/login_state.dart +++ b/wgshare/lib/pages/loginPage/login_state.dart @@ -2,13 +2,18 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; class LoginState { - LoginState() { - ///Initialize variables - } + + LoginState() {} late TextEditingController userNameController = TextEditingController(); late TextEditingController passwordController = TextEditingController(); late FocusNode passwordFocus = FocusNode(); late RxBool canLogin = true.obs; + + /// 页面状态，0：账号，1：会议号 + late RxInt pageState = 0.obs; + + /// 是否勾选协议，0：否，1：是 + late RxInt checkAgreementState = 0.obs; } diff --git a/wgshare/lib/pages/loginPage/login_view.dart b/wgshare/lib/pages/loginPage/login_view.dart index c5db8a9..e106735 100644 --- a/wgshare/lib/pages/loginPage/login_view.dart +++ b/wgshare/lib/pages/loginPage/login_view.dart @@ -1,8 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:wgshare/utils/my_text.dart'; import 'package:wgshare/utils/utils.dart'; +import '../../utils/color_util.dart'; import 'login_logic.dart'; class LoginPage extends StatefulWidget { @@ -24,10 +26,291 @@ class _LoginPageState extends State { @override Widget build(BuildContext context) { + SystemChrome.setSystemUIOverlayStyle( + const SystemUiOverlayStyle(statusBarColor: Colors.transparent)); return Scaffold( - backgroundColor: Colors.transparent, - resizeToAvoidBottomInset: false, - body: Center(child: quickText("登录页面")), + extendBodyBehindAppBar: true, + backgroundColor: Colors.white, + body: Column( + children: [ + Container( + height: 340, + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage('assets/images/login_bg.png'), + fit: BoxFit.fill, + ), + ), + child: Column( + children: [ + Expanded( + child: Container( + margin: const EdgeInsets.only(top: 20), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + 'assets/images/logo.png', + width: 80, + height: 80, + ), + const SizedBox(height: 20), + Image.asset( + 'assets/images/logo_title.png', + width: 70, + height: 24, + ) + ], + ), + )), + Container( + height: 40, + decoration: const BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(99), + topRight: Radius.circular(99)), + color: Colors.white, + ), + ) + ], + ), + ), + Expanded( + child: SingleChildScrollView( + child: Obx(() => Container( + child: Column( + children: [ + Container( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + GestureDetector( + child: Container( + width: 140, + height: 40, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(state.pageState.value == 0 ? 'assets/images/login_tab_left_select_y.png' : 'assets/images/login_tab_left_select_n.png'), + fit: BoxFit.fill, + ), + ), + alignment: Alignment.center, + child: Text( + '账号', + style: TextStyle( + fontSize: 14, + color: state.pageState.value == 0 ? Colors.white : ColorUtil.Color_120_137_203 + ), + ), + ), + onTap: (){ + logic.changePageState(0); + }, + ), + GestureDetector( + child: Container( + width: 140, + height: 40, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(state.pageState.value == 0 ? 'assets/images/login_tab_right_select_n.png' : 'assets/images/login_tab_right_select_y.png'), + fit: BoxFit.fill, + ), + ), + alignment: Alignment.center, + child: Text( + '会议号', + style: TextStyle( + fontSize: 14, + color: state.pageState.value == 0 ? ColorUtil.Color_120_137_203 : Colors.white + ), + ), + ), + onTap: (){ + logic.changePageState(1); + }, + ) + ], + ), + ), + + /** + * 账号密码输入框 + */ + Visibility( + visible: state.pageState.value == 0 ? true : false, + child: Container( + width: 280, + height: 40, + margin: const EdgeInsets.only(top: 30), + padding: const EdgeInsets.only(left: 12, right: 12), + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(99)), + border: Border.all( + width: 1, + color: ColorUtil.Color_153_153_153 + ), + ), + child: TextField( + style: TextStyle( + fontSize: 14, + ), + decoration: InputDecoration( + contentPadding: EdgeInsets.all(0), + border: OutlineInputBorder(borderSide: BorderSide.none), + hintText: '请输入账号', + hintStyle: TextStyle( + color: ColorUtil.Color_153_153_153, + fontSize: 14) + ), + ), + ), + ), + + Visibility( + visible: state.pageState.value == 0 ? true : false, + child: Container( + width: 280, + height: 40, + margin: const EdgeInsets.only(top: 12), + padding: const EdgeInsets.only(left: 12, right: 12), + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(99)), + border: Border.all( + width: 1, + color: ColorUtil.Color_153_153_153 + ), + ), + child: TextField( + style: TextStyle( + fontSize: 14, + ), + decoration: InputDecoration( + contentPadding: EdgeInsets.all(0), + border: OutlineInputBorder(borderSide: BorderSide.none), + hintText: '请输入密码', + hintStyle: TextStyle( + color: ColorUtil.Color_153_153_153, + fontSize: 14) + ), + ), + ), + ), + + /// 会议号输入框 + Visibility( + visible: state.pageState.value == 0 ? false : true, + child: Container( + width: 280, + height: 40, + margin: const EdgeInsets.only(top: 30), + padding: const EdgeInsets.only(left: 12, right: 12), + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(99)), + border: Border.all( + width: 1, + color: ColorUtil.Color_153_153_153 + ), + ), + child: TextField( + style: TextStyle( + fontSize: 14, + ), + decoration: InputDecoration( + contentPadding: EdgeInsets.all(0), + border: OutlineInputBorder(borderSide: BorderSide.none), + hintText: '请输入会议号', + hintStyle: TextStyle( + color: ColorUtil.Color_153_153_153, + fontSize: 14) + ), + ), + ), + ), + + /// 相关协议 + Container( + width: 280, + margin: const EdgeInsets.only(top: 16), + child: Row( + children: [ + GestureDetector( + child: Image.asset( + state.checkAgreementState.value == 0 ? 'assets/images/login_agreement_select_n.png' : 'assets/images/login_agreement_select_y.png', + width: 16, + height: 16, + ), + onTap: (){ + if(state.checkAgreementState.value == 0){ + logic.changeAgreementState(1); + }else{ + logic.changeAgreementState(0); + } + }, + ), + const SizedBox(width: 6), + const Text( + '我阅读并同意', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_153_153_153, + ), + ), + const Text( + '《服务协议》', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_153_153_153, + ), + ), + const Text( + '和', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_153_153_153, + ), + ), + const Text( + '《隐私政策》', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_153_153_153, + ), + ) + ], + ), + ), + + /// 按钮 + GestureDetector( + child: Container( + width: 280, + height: 44, + margin: const EdgeInsets.only(top: 50), + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(99)), + color: ColorUtil.Color_85_117_242, + ), + alignment: Alignment.center, + child: Text( + state.pageState.value == 0 ? '登录' : '加入会议', + style: TextStyle( + fontSize: 16, + color: Colors.white, + ), + ), + ), + onTap: (){ + Get.toNamed("/startPage"); + }, + ) + ], + ), + )), + ), + ) + ], + ), ); } diff --git a/wgshare/lib/pages/minePage/mine_binding.dart b/wgshare/lib/pages/minePage/mine_binding.dart deleted file mode 100644 index 4cad69c..0000000 --- a/wgshare/lib/pages/minePage/mine_binding.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:get/get.dart'; - -import 'mine_logic.dart'; - -class MineBinding extends Bindings { - @override - void dependencies() { - Get.lazyPut(() => MineLogic()); - } -} diff --git a/wgshare/lib/pages/minePage/mine_page.dart b/wgshare/lib/pages/minePage/mine_page.dart deleted file mode 100644 index 7279836..0000000 --- a/wgshare/lib/pages/minePage/mine_page.dart +++ /dev/null @@ -1,21 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:wgshare/utils/my_text.dart'; - -class MinePage extends StatefulWidget { - const MinePage({super.key}); - - @override - State createState() => MminePageState(); -} - -class MminePageState extends State with AutomaticKeepAliveClientMixin { - @override - bool get wantKeepAlive => true; - - @override - Widget build(BuildContext context) { - super.build(context); - - return Center(child: quickText("我的页面")); - } -} diff --git a/wgshare/lib/pages/start_page.dart b/wgshare/lib/pages/start_page.dart index ed7c55c..9df208c 100644 --- a/wgshare/lib/pages/start_page.dart +++ b/wgshare/lib/pages/start_page.dart @@ -7,11 +7,12 @@ import 'package:wgshare/common/mixins/request_tool_mixin.dart'; import 'package:wgshare/common/models/user_info_detail.dart'; import 'package:wgshare/common/store/user_store.dart'; import 'package:wgshare/pages/homePage/home_logic.dart'; -import 'package:wgshare/pages/minePage/mine_page.dart'; +import 'package:wgshare/pages/userPage/user_logic.dart'; +import 'package:wgshare/pages/userPage/user_page.dart'; import 'package:wgshare/utils/toast_utils.dart'; +import '../utils/color_util.dart'; import 'homePage/home_view.dart'; -import 'minePage/mine_logic.dart'; class StartPage extends StatefulWidget { const StartPage({super.key}); @@ -22,7 +23,7 @@ class StartPage extends StatefulWidget { class _StartPageState extends State with RequestToolMixin { DateTime? lastPopTime; - final _pageController = Get.find(); + final _pageController = Get.find(); late final List _bodyList; @@ -30,11 +31,11 @@ class _StartPageState extends State with RequestToolMixin { void initState() { super.initState(); Get.put(HomeLogic()); - Get.put(MineLogic()); + Get.put(UserLogic()); _bodyList = [ const HomePage(), - const MinePage(), + const UserPage(), ]; String? token = UserStore.to.token; @@ -54,7 +55,7 @@ class _StartPageState extends State with RequestToolMixin { @override void dispose() { - Get.delete(); + Get.delete(); super.dispose(); } @@ -80,32 +81,58 @@ class _StartPageState extends State with RequestToolMixin { }, children: _bodyList, ), - bottomNavigationBar: Obx(() { - return BottomNavigationBar( - iconSize: 24.sp, - items: [ - BottomNavigationBarItem( - label: '首页', - icon: getItemIcon('assets/images/home_no_active_icon.png'), - activeIcon: getItemIcon('assets/images/home_icon.png'), - ), - BottomNavigationBarItem( - label: '我的', - icon: getItemIcon('assets/images/mine_no_active_icon.png'), - activeIcon: getItemIcon('assets/images/mine_icon.png'), - ), - ], - //设置显示的模式 - type: BottomNavigationBarType.fixed, - //设置当前的索引 - currentIndex: _pageController._pageIndexState.pageIndex.value, - //tabBottom的点击监听 - onTap: (index) { - print('appbar下标：${index}'); - _pageController._pageIndexState.pageController.jumpToPage(index); - }, - ); - }), + bottomNavigationBar: Theme( + data: ThemeData( + splashColor: Colors.transparent, + highlightColor: Colors.transparent, + ), + child: Obx(() { + return BottomNavigationBar ( + iconSize: 24.sp, + items: [ + BottomNavigationBarItem( + label: '首页', + icon: Image.asset( + 'assets/images/home_index_select_n.png', + width: 22, + height: 22, + ), + activeIcon: Image.asset( + 'assets/images/home_index_select_y.png', + width: 22, + height: 22, + ), + ), + BottomNavigationBarItem( + label: '我的', + icon: Image.asset( + 'assets/images/home_user_select_n.png', + width: 22, + height: 22, + ), + activeIcon: Image.asset( + 'assets/images/home_user_select_y.png', + width: 22, + height: 22, + ), + ), + ], + //设置显示的模式 + type: BottomNavigationBarType.fixed, + backgroundColor: Colors.white, + selectedFontSize: 14, + selectedItemColor: ColorUtil.Color_85_117_242, + unselectedFontSize: 14, + unselectedItemColor: ColorUtil.Color_80_87_103, + //设置当前的索引 + currentIndex: _pageController._pageIndexState.pageIndex.value, + //tabBottom的点击监听 + onTap: (index) { + print('appbar下标：${index}'); + _pageController._pageIndexState.pageController.jumpToPage(index); + }, + ); + })), ), onWillPop: () async { if (lastPopTime == null || DateTime.now().difference(lastPopTime!) > const Duration(seconds: 1)) { @@ -122,8 +149,8 @@ class _StartPageState extends State with RequestToolMixin { } } -class PageIndexState { - PageIndexState({required this.pageController, this.showUpgrade = false}); +class StartPageState { + StartPageState({required this.pageController, this.showUpgrade = false}); RxInt pageIndex = 0.obs; bool showUpgrade; @@ -132,19 +159,19 @@ class PageIndexState { final PageController pageController; } -class PageIndexController extends GetxController with RequestToolMixin { - late PageIndexState _pageIndexState; +class StartPageController extends GetxController with RequestToolMixin { + late StartPageState _pageIndexState; @override void onInit() { - _pageIndexState = PageIndexState(pageController: PageController()); + _pageIndexState = StartPageState(pageController: PageController()); super.onInit(); } } -class StartPageIndexBinding extends Bindings { +class StartPageBinding extends Bindings { @override void dependencies() { - Get.lazyPut(() => PageIndexController()); + Get.lazyPut(() => StartPageController()); } } diff --git a/wgshare/lib/pages/userPage/user_binding.dart b/wgshare/lib/pages/userPage/user_binding.dart new file mode 100644 index 0000000..fa61dc1 --- /dev/null +++ b/wgshare/lib/pages/userPage/user_binding.dart @@ -0,0 +1,10 @@ +import 'package:get/get.dart'; + +import 'user_logic.dart'; + +class UserBinding extends Bindings { + @override + void dependencies() { + Get.lazyPut(() => UserLogic()); + } +} diff --git a/wgshare/lib/pages/minePage/mine_logic.dart b/wgshare/lib/pages/userPage/user_logic.dart similarity index 54% rename from wgshare/lib/pages/minePage/mine_logic.dart rename to wgshare/lib/pages/userPage/user_logic.dart index cec4753..fd3971e 100644 --- a/wgshare/lib/pages/minePage/mine_logic.dart +++ b/wgshare/lib/pages/userPage/user_logic.dart @@ -1,10 +1,10 @@ import 'package:get/get.dart'; import 'package:wgshare/common/mixins/request_tool_mixin.dart'; -import 'mine_state.dart'; +import 'user_state.dart'; -class MineLogic extends GetxController with RequestToolMixin { - final MineState state = MineState(); +class UserLogic extends GetxController with RequestToolMixin { + final UserState state = UserState(); @override void onClose() { diff --git a/wgshare/lib/pages/userPage/user_page.dart b/wgshare/lib/pages/userPage/user_page.dart new file mode 100644 index 0000000..abe8e2a --- /dev/null +++ b/wgshare/lib/pages/userPage/user_page.dart @@ -0,0 +1,196 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:wgshare/utils/my_text.dart'; + +import '../../utils/color_util.dart'; + +class UserPage extends StatefulWidget { + const UserPage({super.key}); + + @override + State createState() => UserPageState(); +} + +class UserPageState extends State with AutomaticKeepAliveClientMixin { + @override + bool get wantKeepAlive => true; + + @override + Widget build(BuildContext context) { + super.build(context); + return Scaffold( + appBar: AppBar( + surfaceTintColor: Colors.white, + elevation: 0, + toolbarHeight: 0, + systemOverlayStyle: const SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + systemNavigationBarColor: Color(0xFF000000), + systemNavigationBarIconBrightness: Brightness.light, + statusBarIconBrightness: Brightness.dark, + statusBarBrightness: Brightness.light, + ), + backgroundColor: Colors.white, + ), + body: Container( + color: ColorUtil.Color_244_244_244, + child: Column( + children: [ + Container( + width: double.infinity, + height: 44, + color: Colors.white, + alignment: Alignment.center, + child: Text( + '我的', + style: TextStyle( + fontSize: 16, + color: ColorUtil.Color_51_51_51, + fontWeight: FontWeight.w500 + ), + ), + ), + Container( + width: double.infinity, + child: Container( + width: double.infinity, + color: Colors.white, + margin: const EdgeInsets.only(top: 1), + padding: const EdgeInsets.only(bottom: 60), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.only(top: 20, bottom: 6), + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(100), + image: DecorationImage( + fit: BoxFit.cover, + image: NetworkImage( + "https://ts4.cn.mm.bing.net/th?id=OIP-C.QDl_Z7HdQWX_XbVYgBLJLQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&pid=3.1&rm=2", + ), + ), + ), + width: 132, + height: 132, + ), + ), + Container( + child: Text( + '晓晓', + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + color: ColorUtil.Color_85_117_242 + ), + ), + ), + Container( + padding: const EdgeInsets.only(left: 16, right: 16), + margin: const EdgeInsets.only(top: 20), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + '名称', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_134_134_134 + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '晓晓', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_51_51_51 + ), + ), + const SizedBox(width: 12), + Image.asset( + 'assets/images/user_right.png', + width: 10, + height: 10, + ) + ], + ), + ], + ) + ), + Container( + width: double.infinity, + height: 1, + color: ColorUtil.Color_230_230_230, + margin: const EdgeInsets.only(top: 12, left: 16, right: 16), + ), + + Container( + padding: const EdgeInsets.only(left: 16, right: 16), + margin: const EdgeInsets.only(top: 20), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + '登录密码', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_134_134_134 + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '********', + style: TextStyle( + fontSize: 12, + color: ColorUtil.Color_51_51_51 + ), + ), + const SizedBox(width: 12), + Image.asset( + 'assets/images/user_right.png', + width: 10, + height: 10, + ) + ], + ), + ], + ) + ), + Container( + width: double.infinity, + height: 1, + color: ColorUtil.Color_230_230_230, + margin: const EdgeInsets.only(top: 12, left: 16, right: 16), + ), + ], + ), + ), + ), + + Container( + width: 280, + height: 44, + margin: const EdgeInsets.only(top: 40), + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(99)), + color: ColorUtil.Color_85_117_242, + ), + alignment: Alignment.center, + child: const Text( + '退出登录', + style: TextStyle( + fontSize: 16, + color: Colors.white, + ), + ), + ) + ], + ), + ) + ); + } +} diff --git a/wgshare/lib/pages/minePage/mine_state.dart b/wgshare/lib/pages/userPage/user_state.dart similarity index 69% rename from wgshare/lib/pages/minePage/mine_state.dart rename to wgshare/lib/pages/userPage/user_state.dart index b212f7f..e07a357 100644 --- a/wgshare/lib/pages/minePage/mine_state.dart +++ b/wgshare/lib/pages/userPage/user_state.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -class MineState { - MineState(); +class UserState { + UserState(); } diff --git a/wgshare/lib/routes/app_pages.dart b/wgshare/lib/routes/app_pages.dart index d744ba8..b1a9fd4 100644 --- a/wgshare/lib/routes/app_pages.dart +++ b/wgshare/lib/routes/app_pages.dart @@ -3,17 +3,17 @@ import 'package:wgshare/pages/homePage/home_binding.dart'; import 'package:wgshare/pages/homePage/home_view.dart'; import 'package:wgshare/pages/loginPage/login_binding.dart'; import 'package:wgshare/pages/loginPage/login_view.dart'; -import 'package:wgshare/pages/minePage/mine_binding.dart'; -import 'package:wgshare/pages/minePage/mine_page.dart'; import 'package:wgshare/pages/start_page.dart'; +import '../pages/userPage/user_binding.dart'; +import '../pages/userPage/user_page.dart'; import 'app_routes.dart'; abstract class AppPages { static final pages = [ - GetPage(name: Routes.startPage, page: () => const StartPage(), binding: StartPageIndexBinding(), transition: Transition.noTransition), - GetPage(name: Routes.home, page: () => const HomePage(), binding: HomeBinding(), transition: Transition.noTransition), - GetPage(name: Routes.myPage, page: () => const MinePage(), binding: MineBinding(), transition: Transition.noTransition), - GetPage(name: Routes.login, page: () => const LoginPage(), binding: LoginBinding(), transition: Transition.noTransition), + GetPage(name: Routes.startPage, page: () => const StartPage(), binding: StartPageBinding(), transition: Transition.noTransition), + GetPage(name: Routes.homePage, page: () => const HomePage(), binding: HomeBinding(), transition: Transition.noTransition), + GetPage(name: Routes.userPage, page: () => const UserPage(), binding: UserBinding(), transition: Transition.noTransition), + GetPage(name: Routes.loginPage, page: () => const LoginPage(), binding: LoginBinding(), transition: Transition.noTransition), ]; } diff --git a/wgshare/lib/routes/app_routes.dart b/wgshare/lib/routes/app_routes.dart index 1e0b896..914e947 100644 --- a/wgshare/lib/routes/app_routes.dart +++ b/wgshare/lib/routes/app_routes.dart @@ -1,7 +1,7 @@ // part of 'app_pages.dart'; abstract class Routes { - static const startPage = '/startPage'; //初始化页面 - static const home = '/home'; //首页 - static const myPage = '/myPage'; //我的 - static const login = '/login'; //登录 + static const loginPage = '/loginPage'; //登录 + static const startPage = '/startPage'; //TAB页面 + static const homePage = '/homePage'; //首页 + static const userPage = '/userPage'; //我的 } diff --git a/wgshare/lib/utils/color_util.dart b/wgshare/lib/utils/color_util.dart new file mode 100644 index 0000000..e8204b4 --- /dev/null +++ b/wgshare/lib/utils/color_util.dart @@ -0,0 +1,82 @@ +import 'package:flutter/material.dart'; + +class ColorUtil { + + /// 主色调 + static const Color_85_117_242 = Color.fromRGBO(85, 117, 242, 1); + + static const Color_80_87_103 = Color.fromRGBO(80, 87, 103, 1); + + static const Color_51_51_51 = Color.fromRGBO(51, 51, 51, 1); + + static const Color_244_244_244 = Color.fromRGBO(244, 244, 244, 1); + + static const Color_89_88_88 = Color.fromRGBO(89, 88, 88, 1); + + static const Color_177_177_177 = Color.fromRGBO(177, 177, 177, 1); + + static const Color_120_137_203 = Color.fromRGBO(120, 137, 203, 1); + + static const Color_153_153_153 = Color.fromRGBO(153, 153, 153, 1); + + static const Color_41_41_41 = Color.fromRGBO(41, 41, 41, 1); + + static const Color_35_35_35 = Color.fromRGBO(35, 35, 35, 1); + static const Color_35_35_35_07 = Color.fromRGBO(35, 35, 35, 0.7); + + static const Color_156_156_156 = Color.fromRGBO(156, 156, 156, 1); + + static const Color_202_202_202 = Color.fromRGBO(202, 202, 202, 1); + + static const Color_7_9_11 = Color.fromRGBO(7, 9, 11, 1); + + static const Color_49_53_58 = Color.fromRGBO(49, 53, 58, 1); + + static const Color_16_20_24 = Color.fromRGBO(16, 20, 24, 1); + + static const Color_0_0_0_1 = Color.fromRGBO(0, 0, 0, 1); + static const Color_0_0_0_0 = Color.fromRGBO(0, 0, 0, 0); + static const Color_0_0_0_96 = Color.fromRGBO(0, 0, 0, 0.96); + + static const Color_134_134_134 = Color.fromRGBO(134, 134, 134, 1); + + static const Color_49_47_47 = Color.fromRGBO(49, 47, 47, 1); + + static const Color_57_57_57 = Color.fromRGBO(57, 57, 57, 1); + static const Color_57_57_57_08 = Color.fromRGBO(57, 57, 57, 0.8); + + static const Color_238_238_238 = Color.fromRGBO(238, 238, 238, 1); + + static const Color_70_71_73 = Color.fromRGBO(70, 71, 73, 1); + + static const Color_243_243_243 = Color.fromRGBO(243, 243, 243, 1); + + static const Color_2_177_136 = Color.fromRGBO(2, 177, 136, 1); + + static const Color_28_28_28 = Color.fromRGBO(28, 28, 28, 1); + + static const Color_53_53_53 = Color.fromRGBO(53, 53, 53, 1); + + static const Color_235_235_235 = Color.fromRGBO(235, 235, 235, 1); + + static const Color_185_184_184 = Color.fromRGBO(185, 184, 184, 1); + + static const Color_255_255_255 = Color.fromRGBO(255, 255, 255, 1); + + static const Color_108_108_108 = Color.fromRGBO(108, 108, 108, 1); + + static const Color_230_230_230 = Color.fromRGBO(230, 230, 230, 1); + + /// 十六进制颜色， + /// hex, 十六进制值，例如：0xffffff, + /// alpha, 透明度 [0.0,1.0] + static Color hexColor(int hex, {double alpha = 1}) { + if (alpha < 0) { + alpha = 0; + } else if (alpha > 1) { + alpha = 1; + } + return Color.fromRGBO((hex & 0xFF0000) >> 16, (hex & 0x00FF00) >> 8, + (hex & 0x0000FF) >> 0, alpha); + } +} diff --git a/wgshare/pubspec.yaml b/wgshare/pubspec.yaml index 613195c..a66afc2 100644 --- a/wgshare/pubspec.yaml +++ b/wgshare/pubspec.yaml @@ -93,10 +93,8 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - assets/images/ - - assets/images/1.5x/ - assets/images/2.0x/ - assets/images/3.0x/ - - assets/images/4.0x/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images