From 2e2d2ac818456d8f2eec91ce9dd072f9fe0d5716 Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Fri, 2 Feb 2024 10:11:08 +0800
Subject: [PATCH] =?UTF-8?q?version:4.4=20fix:=20update:=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E9=97=B9=E9=92=9F=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 8 +-
app/src/main/AndroidManifest.xml | 29 +-
.../java/com/uiui/video/bean/VideoInfo.java | 158 +++
.../aios/activity/InformationActivity.java | 148 +++
.../activity/InformationDetailsActivity.java | 43 +
.../aios/activity/alarm/AlarmActivity.java | 300 +++++
.../aios/activity/alarm/AlarmContact.java | 21 +
.../aios/activity/alarm/AlarmPresenter.java | 101 ++
.../AlarmClockActivity.java | 4 +-
.../AlarmClockAddActivity.java | 257 ++--
.../AlarmClockContact.java | 2 +-
.../AlarmClockEditActivity.java | 297 +++--
.../AlarmClockPresenter.java | 2 +-
.../activity/location/LocationAcivity.java | 228 ++++
.../activity/location/LocationContact.java | 17 +
.../activity/location/LocationPresenter.java | 122 ++
.../aios/activity/main/MainActivity.java | 20 +-
.../activity/weather/WeatherActivity.java | 274 +++-
.../aios/activity/weather/WeatherContact.java | 6 +-
.../activity/weather/WeatherPresenter.java | 52 +-
.../com/uiuios/aios/adapter/CityAdapter.java | 77 ++
.../uiuios/aios/adapter/DistrictAdapter.java | 77 ++
.../aios/adapter/InformationAdapter.java | 75 ++
.../aios/adapter/KnowledgeVideoAdapter.java | 81 ++
.../aios/adapter/LivenVideoAdapter.java | 77 ++
.../aios/adapter/NewArticleAdapter.java | 71 +
.../uiuios/aios/adapter/NewGoodsAdapter.java | 68 +
.../com/uiuios/aios/adapter/TitleAdapter.java | 91 ++
.../com/uiuios/aios/alarm/AlarmAdapter.java | 2 +-
.../com/uiuios/aios/alarm/AlarmClockData.java | 11 +
.../aios/base/BaseDataBindingActivity.java | 123 ++
.../com/uiuios/aios/base/BaseFragment.java | 2 +-
.../com/uiuios/aios/bean/AddressBean.java | 63 +
.../com/uiuios/aios/bean/ArticleInfo.java | 37 +
.../com/uiuios/aios/bean/CategoryBean.java | 26 +
.../java/com/uiuios/aios/bean/JsonBean.java | 76 ++
.../java/com/uiuios/aios/bean/MapGeoBean.java | 37 +
.../com/uiuios/aios/bean/MapGeoLocation.java | 34 +
.../com/uiuios/aios/bean/MapGeoResult.java | 64 +
.../com/uiuios/aios/config/CommonConfig.java | 10 +
.../uiuios/aios/fragment/AppListFragment.java | 5 +-
.../aios/fragment/custom/CustomFragment.java | 10 +-
.../aios/fragment/home/HomeFragment.java | 58 +-
.../aios/fragment/second/SecondContact.java | 9 +-
.../aios/fragment/second/SecondFragment.java | 354 +++--
.../aios/fragment/second/SecondPresenter.java | 76 +-
.../com/uiuios/aios/gson/GetJsonDataUtil.java | 38 +
.../com/uiuios/aios/manager/AppManager.java | 4 +
.../uiuios/aios/manager/RemoteManager.java | 12 +
.../aios/network/NetInterfaceManager.java | 75 +-
.../com/uiuios/aios/network/UrlAddress.java | 13 +
.../aios/network/api/AlarmClockApi.java | 5 +-
.../uiuios/aios/network/api/CategorysApi.java | 18 +
.../network/api/KnowledgeVideoListApi.java | 19 +
.../aios/network/api/LivenVideoListApi.java | 18 +
.../aios/network/api/amap/GeocodingApi.java | 17 +
.../uiuios/aios/service/main/MainService.java | 31 +-
.../java/com/uiuios/aios/utils/ApkUtils.java | 8 +
.../com/uiuios/aios/utils/BitmapUtils.java | 11 +
.../java/com/uiuios/aios/utils/TimeUtils.java | 6 +
.../uiuios/aios/view/ImageViewAdapter.java | 66 +
.../com/uiuios/aios/view/StartSnapHelper.java | 105 ++
.../main/res/drawable-hdpi/actions_about.png | Bin 2239 -> 2419 bytes
.../res/drawable-hdpi/actions_account.png | Bin 1611 -> 2419 bytes
.../res/drawable-hdpi/actions_booktag.png | Bin 1087 -> 2419 bytes
.../main/res/drawable-hdpi/actions_cent.png | Bin 1497 -> 2419 bytes
.../res/drawable-hdpi/actions_comment.png | Bin 1683 -> 2419 bytes
.../res/drawable-hdpi/actions_feedback.png | Bin 2166 -> 2419 bytes
.../main/res/drawable-hdpi/actions_order.png | Bin 1508 -> 2419 bytes
.../main/res/drawable-hdpi/actions_weibo.png | Bin 2089 -> 2419 bytes
.../drawable-hdpi/com_android_appstore.png | Bin 7258 -> 24293 bytes
.../res/drawable-hdpi/com_android_browser.png | Bin 11922 -> 36783 bytes
.../drawable-hdpi/com_android_calculator2.png | Bin 4056 -> 29235 bytes
.../drawable-hdpi/com_android_calendar.png | Bin 4521 -> 14179 bytes
.../res/drawable-hdpi/com_android_camera.png | Bin 17490 -> 28819 bytes
.../res/drawable-hdpi/com_android_clean.png | Bin 5842 -> 34160 bytes
.../drawable-hdpi/com_android_contacts.png | Bin 7988 -> 24482 bytes
.../drawable-hdpi/com_android_deskclock.png | Bin 8228 -> 19214 bytes
.../res/drawable-hdpi/com_android_dialer.png | Bin 5972 -> 38321 bytes
.../res/drawable-hdpi/com_android_email.png | Bin 5393 -> 25581 bytes
.../com_android_gallery3d_app.png | Bin 9131 -> 37875 bytes
.../res/drawable-hdpi/com_android_mms_ui.png | Bin 7527 -> 26452 bytes
.../res/drawable-hdpi/com_android_music.png | Bin 12654 -> 28648 bytes
.../com_android_providers_downloads_ui.png | Bin 2867 -> 32535 bytes
.../drawable-hdpi/com_android_settings.png | Bin 9275 -> 42414 bytes
.../com_android_soundrecorder.png | Bin 8496 -> 37434 bytes
.../drawable-hdpi/com_android_stk_stkmain.png | Bin 4148 -> 21287 bytes
.../res/drawable-hdpi/com_android_vdieo.png | Bin 5975 -> 19061 bytes
.../com_mediatek_filemanager.png | Bin 3542 -> 22138 bytes
.../drawable-hdpi/com_mediatek_fmradio.png | Bin 10615 -> 16298 bytes
.../main/res/drawable-hdpi/com_uiui_sn.png | Bin 7445 -> 23301 bytes
.../main/res/drawable-hdpi/default_avatar.png | Bin 9941 -> 8584 bytes
.../main/res/drawable-hdpi/default_head.png | Bin 5218 -> 8584 bytes
app/src/main/res/drawable-hdpi/exit_icon.png | Bin 3012 -> 29775 bytes
.../drawable-hdpi/home_application_icon.png | Bin 9006 -> 6565 bytes
.../res/drawable-hdpi/home_avatar_icon.png | Bin 37832 -> 50006 bytes
.../main/res/drawable-hdpi/home_dialer.png | Bin 9887 -> 6970 bytes
.../res/drawable-hdpi/home_family_space.png | Bin 5727 -> 114942 bytes
.../main/res/drawable-hdpi/home_icon_sos.png | Bin 0 -> 6820 bytes
.../main/res/drawable-hdpi/icon_add_alarm.png | Bin 5865 -> 5347 bytes
.../drawable-hdpi/icon_add_alarm_clock.png | Bin 0 -> 5865 bytes
.../main/res/drawable-hdpi/icon_alarm_all.png | Bin 0 -> 8757 bytes
.../drawable-hdpi/icon_alarm_all_pressed.png | Bin 0 -> 8902 bytes
.../res/drawable-hdpi/icon_alarm_look.png | Bin 0 -> 8294 bytes
.../drawable-hdpi/icon_alarm_look_pressed.png | Bin 0 -> 9967 bytes
.../res/drawable-hdpi/icon_alarm_medicine.png | Bin 0 -> 9237 bytes
.../icon_alarm_medicine_pressed.png | Bin 0 -> 9672 bytes
.../res/drawable-hdpi/icon_alarm_reserve.png | Bin 0 -> 9295 bytes
.../icon_alarm_reserve_pressed.png | Bin 0 -> 9422 bytes
.../res/drawable-hdpi/icon_contact_add.png | Bin 5835 -> 9211 bytes
.../main/res/drawable-hdpi/icon_daily_app.png | Bin 12981 -> 33959 bytes
.../res/drawable-hdpi/icon_day_normal.png | Bin 0 -> 2786 bytes
.../res/drawable-hdpi/icon_day_pressed.png | Bin 0 -> 2990 bytes
.../res/drawable-hdpi/icon_once_normal.png | Bin 0 -> 2419 bytes
.../res/drawable-hdpi/icon_once_pressed.png | Bin 0 -> 2527 bytes
app/src/main/res/drawable-hdpi/icon_play.png | Bin 0 -> 2880 bytes
.../main/res/drawable-hdpi/icon_search.png | Bin 0 -> 4595 bytes
app/src/main/res/drawable-hdpi/icon_touch.png | Bin 0 -> 619 bytes
app/src/main/res/drawable-hdpi/mask.png | Bin 2120 -> 2680 bytes
app/src/main/res/drawable-hdpi/ship.png | Bin 1192 -> 2419 bytes
.../res/drawable/alarm_pressed_background.xml | 15 +
.../res/drawable/background_second_card.xml | 26 +
.../res/drawable/background_second_title.xml | 24 +
app/src/main/res/drawable/badge_bg.xml | 8 +-
.../res/drawable/bg_black_transparent.xml | 14 +
app/src/main/res/drawable/buy_button_bg.xml | 17 +
.../main/res/drawable/custom_bg_weather.xml | 22 +-
.../res/drawable/custom_bg_weather_night.xml | 17 +
.../res/drawable/custom_bg_weather_rain.xml | 17 +
.../res/drawable/item_city_background.xml | 13 +
.../main/res/drawable/location_background.xml | 13 +
.../drawable/location_search_background.xml | 13 +
.../main/res/drawable/position_background.xml | 18 +
app/src/main/res/drawable/refresh_bg.xml | 13 +
.../main/res/drawable/title_background.xml | 13 +
.../res/drawable/title_select_background.xml | 13 +
.../main/res/drawable/tv_times_bg_look.xml | 9 +
.../drawable/tv_times_bg_loop_selector.xml | 4 +-
.../res/drawable/tv_times_bg_medicine.xml | 9 +
.../main/res/drawable/tv_times_bg_once.xml | 2 +-
.../drawable/tv_times_bg_once_selector.xml | 4 +-
.../main/res/drawable/tv_times_bg_reserve.xml | 9 +
.../main/res/layout-land/activity_weather.xml | 36 +-
.../main/res/layout-land/fragment_second.xml | 1164 ++++++++++-------
.../main/res/layout-port/activity_weather.xml | 36 +-
.../main/res/layout/activity_add_alarm.xml | 424 ++++++
.../res/layout/activity_add_alarm_clock.xml | 2 +-
app/src/main/res/layout/activity_alarm.xml | 294 +++++
.../main/res/layout/activity_alarm_clock.xml | 2 +-
.../main/res/layout/activity_info_details.xml | 92 ++
.../main/res/layout/activity_information.xml | 65 +
app/src/main/res/layout/activity_location.xml | 138 ++
app/src/main/res/layout/fragment_home.xml | 217 ++-
app/src/main/res/layout/item_actions.xml | 14 +-
app/src/main/res/layout/item_city.xml | 22 +
app/src/main/res/layout/item_district.xml | 24 +
app/src/main/res/layout/item_information.xml | 46 +
.../main/res/layout/item_knowledge_video.xml | 54 +
app/src/main/res/layout/item_liven_video.xml | 40 +
app/src/main/res/layout/item_new_article.xml | 34 +
app/src/main/res/layout/item_new_goods.xml | 65 +
app/src/main/res/layout/item_title.xml | 22 +
app/src/main/res/values/colors.xml | 4 +
163 files changed, 6128 insertions(+), 1109 deletions(-)
create mode 100644 app/src/main/java/com/uiui/video/bean/VideoInfo.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/InformationActivity.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/alarm/AlarmActivity.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/alarm/AlarmContact.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/alarm/AlarmPresenter.java
rename app/src/main/java/com/uiuios/aios/activity/{alarm => alarmclock}/AlarmClockActivity.java (98%)
rename app/src/main/java/com/uiuios/aios/activity/{alarm => alarmclock}/AlarmClockAddActivity.java (72%)
rename app/src/main/java/com/uiuios/aios/activity/{alarm => alarmclock}/AlarmClockContact.java (91%)
rename app/src/main/java/com/uiuios/aios/activity/{alarm => alarmclock}/AlarmClockEditActivity.java (74%)
rename app/src/main/java/com/uiuios/aios/activity/{alarm => alarmclock}/AlarmClockPresenter.java (97%)
create mode 100644 app/src/main/java/com/uiuios/aios/activity/location/LocationAcivity.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/location/LocationContact.java
create mode 100644 app/src/main/java/com/uiuios/aios/activity/location/LocationPresenter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/CityAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/DistrictAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/InformationAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/KnowledgeVideoAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/LivenVideoAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/NewArticleAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/NewGoodsAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/adapter/TitleAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/base/BaseDataBindingActivity.java
create mode 100644 app/src/main/java/com/uiuios/aios/bean/AddressBean.java
create mode 100644 app/src/main/java/com/uiuios/aios/bean/CategoryBean.java
create mode 100644 app/src/main/java/com/uiuios/aios/bean/JsonBean.java
create mode 100644 app/src/main/java/com/uiuios/aios/bean/MapGeoBean.java
create mode 100644 app/src/main/java/com/uiuios/aios/bean/MapGeoLocation.java
create mode 100644 app/src/main/java/com/uiuios/aios/bean/MapGeoResult.java
create mode 100644 app/src/main/java/com/uiuios/aios/gson/GetJsonDataUtil.java
create mode 100644 app/src/main/java/com/uiuios/aios/network/api/CategorysApi.java
create mode 100644 app/src/main/java/com/uiuios/aios/network/api/KnowledgeVideoListApi.java
create mode 100644 app/src/main/java/com/uiuios/aios/network/api/LivenVideoListApi.java
create mode 100644 app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java
create mode 100644 app/src/main/java/com/uiuios/aios/view/ImageViewAdapter.java
create mode 100644 app/src/main/java/com/uiuios/aios/view/StartSnapHelper.java
create mode 100644 app/src/main/res/drawable-hdpi/home_icon_sos.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_add_alarm_clock.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_all.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_all_pressed.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_look.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_look_pressed.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_medicine.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_medicine_pressed.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_reserve.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_alarm_reserve_pressed.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_day_normal.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_day_pressed.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_once_normal.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_once_pressed.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_play.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_search.png
create mode 100644 app/src/main/res/drawable-hdpi/icon_touch.png
create mode 100644 app/src/main/res/drawable/alarm_pressed_background.xml
create mode 100644 app/src/main/res/drawable/background_second_card.xml
create mode 100644 app/src/main/res/drawable/background_second_title.xml
create mode 100644 app/src/main/res/drawable/bg_black_transparent.xml
create mode 100644 app/src/main/res/drawable/buy_button_bg.xml
create mode 100644 app/src/main/res/drawable/custom_bg_weather_night.xml
create mode 100644 app/src/main/res/drawable/custom_bg_weather_rain.xml
create mode 100644 app/src/main/res/drawable/item_city_background.xml
create mode 100644 app/src/main/res/drawable/location_background.xml
create mode 100644 app/src/main/res/drawable/location_search_background.xml
create mode 100644 app/src/main/res/drawable/position_background.xml
create mode 100644 app/src/main/res/drawable/refresh_bg.xml
create mode 100644 app/src/main/res/drawable/title_background.xml
create mode 100644 app/src/main/res/drawable/title_select_background.xml
create mode 100644 app/src/main/res/drawable/tv_times_bg_look.xml
create mode 100644 app/src/main/res/drawable/tv_times_bg_medicine.xml
create mode 100644 app/src/main/res/drawable/tv_times_bg_reserve.xml
create mode 100644 app/src/main/res/layout/activity_add_alarm.xml
create mode 100644 app/src/main/res/layout/activity_alarm.xml
create mode 100644 app/src/main/res/layout/activity_info_details.xml
create mode 100644 app/src/main/res/layout/activity_information.xml
create mode 100644 app/src/main/res/layout/activity_location.xml
create mode 100644 app/src/main/res/layout/item_city.xml
create mode 100644 app/src/main/res/layout/item_district.xml
create mode 100644 app/src/main/res/layout/item_information.xml
create mode 100644 app/src/main/res/layout/item_knowledge_video.xml
create mode 100644 app/src/main/res/layout/item_liven_video.xml
create mode 100644 app/src/main/res/layout/item_new_article.xml
create mode 100644 app/src/main/res/layout/item_new_goods.xml
create mode 100644 app/src/main/res/layout/item_title.xml
diff --git a/app/build.gradle b/app/build.gradle
index ffbf0f3..a2cb5e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
applicationId "com.uiuios.aios"
minSdkVersion 24
targetSdkVersion 29
- versionCode 31
- versionName "4.0"
+ versionCode 35
+ versionName "4.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -32,6 +32,10 @@ android {
]
}
+ dataBinding {
+ enabled true
+ }
+
lintOptions {
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e15889..cc63663 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
-
+
+
@@ -123,6 +124,11 @@
android:name=".activity.weather.WeatherActivity"
android:launchMode="singleTask"
android:screenOrientation="landscape" />
+
@@ -140,17 +146,21 @@
android:theme="@style/activity_styles" />
+
+ android:screenOrientation="userLandscape" />
+ android:screenOrientation="userLandscape" />
+
+
CREATOR = new Creator() {
+ @Override
+ public VideoInfo createFromParcel(Parcel in) {
+ return new VideoInfo(in);
+ }
+
+ @Override
+ public VideoInfo[] newArray(int size) {
+ return new VideoInfo[size];
+ }
+ };
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getType_name() {
+ return type_name;
+ }
+
+ public void setType_name(String type_name) {
+ this.type_name = type_name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getVideo_file() {
+ return video_file;
+ }
+
+ public void setVideo_file(String video_file) {
+ this.video_file = video_file;
+ }
+
+ public String getVideo_cover() {
+ return video_cover;
+ }
+
+ public void setVideo_cover(String video_cover) {
+ this.video_cover = video_cover;
+ }
+
+ public double getVideo_duration() {
+ return video_duration;
+ }
+
+ public void setVideo_duration(double video_duration) {
+ this.video_duration = video_duration;
+ }
+
+ public long getVideo_size() {
+ return video_size;
+ }
+
+ public void setVideo_size(long video_size) {
+ this.video_size = video_size;
+ }
+
+ public int getWeigh() {
+ return weigh;
+ }
+
+ public void setWeigh(int weigh) {
+ this.weigh = weigh;
+ }
+
+ public int getPlay_count() {
+ return play_count;
+ }
+
+ public void setPlay_count(int play_count) {
+ this.play_count = play_count;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java b/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java
new file mode 100644
index 0000000..81f1485
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java
@@ -0,0 +1,148 @@
+package com.uiuios.aios.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+import com.trello.rxlifecycle4.RxLifecycle;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.InformationAdapter;
+import com.uiuios.aios.adapter.TitleAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.ArticleInfo;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.CategoryBean;
+import com.uiuios.aios.network.NetInterfaceManager;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+
+public class InformationActivity extends BaseActivity {
+
+ @BindView(R.id.rv_title)
+ RecyclerView rv_title;
+ @BindView(R.id.rv_video)
+ RecyclerView rv_video;
+ @BindView(R.id.cl_nodata)
+ ConstraintLayout cl_nodata;
+
+ private TitleAdapter mTitleAdapter;
+ private InformationAdapter mInformationAdapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_information;
+ }
+
+ @Override
+ public void initView() {
+ ButterKnife.bind(this);
+ mTitleAdapter = new TitleAdapter();
+ mTitleAdapter.setTitleChangeCallback(new TitleAdapter.TitleChangeCallback() {
+ @Override
+ public void onTitleChange(CategoryBean categoryBean) {
+ int id = categoryBean.getId();
+ if (id == -100) {
+
+ } else {
+
+ }
+ }
+ });
+ LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+ linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+ rv_title.setLayoutManager(linearLayoutManager);
+ rv_title.setAdapter(mTitleAdapter);
+
+ mInformationAdapter =new InformationAdapter();
+ LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(this);
+ linearLayoutManager1.setOrientation(LinearLayoutManager.VERTICAL);
+ rv_video.setLayoutManager(linearLayoutManager1);
+ rv_video.setAdapter(mInformationAdapter);
+ }
+
+ @Override
+ public void initData() {
+ getCategorys();
+ getArticleList();
+ }
+
+ private void getCategorys() {
+ NetInterfaceManager.getInstance().getCategorysObservable()
+ .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+ .subscribe(new Observer>>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("getCategorys", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(@NonNull BaseResponse> listBaseResponse) {
+ Log.e("getCategorys", "onNext: " + listBaseResponse);
+ if (listBaseResponse.code == 200) {
+ mTitleAdapter.setCategoryList(listBaseResponse.data);
+ } else {
+ mTitleAdapter.setCategoryList(null);
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("getCategorys", "onError: " + e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("getCategorys", "onComplete: ");
+ }
+ });
+
+ }
+
+ private void getArticleList() {
+ NetInterfaceManager.getInstance().getArticleListObservable()
+ .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+ .subscribe(new Observer>>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("getArticle", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(@NonNull BaseResponse> listBaseResponse) {
+ Log.e("getArticle", "onNext: " + listBaseResponse);
+ List articleInfoList = listBaseResponse.data;
+ if (articleInfoList != null && articleInfoList.size() != 0) {
+ mInformationAdapter.setArticleInfos(articleInfoList);
+ rv_video.setVisibility(View.VISIBLE);
+ cl_nodata.setVisibility(android.view.View.GONE);
+ } else {
+ rv_video.setVisibility(android.view.View.GONE);
+ cl_nodata.setVisibility(android.view.View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("getArticle", "onError: " + e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("getArticle", "onComplete: ");
+ }
+ });
+ }
+
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java b/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java
new file mode 100644
index 0000000..c3ae9f6
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java
@@ -0,0 +1,43 @@
+package com.uiuios.aios.activity;
+
+import android.content.Intent;
+
+import androidx.databinding.DataBindingUtil;
+
+import com.uiuios.aios.R;
+import com.uiuios.aios.base.BaseDataBindingActivity;
+import com.uiuios.aios.bean.ArticleInfo;
+import com.uiuios.aios.databinding.ActivityInfoDetailsBinding;
+
+public class InformationDetailsActivity extends BaseDataBindingActivity {
+
+// @BindView(R.id.tv_title)
+// TextView tv_title;
+// @BindView(R.id.tv_time)
+// TextView tv_time;
+// @BindView(R.id.niceImageView)
+// NiceImageView niceImageView;
+// @BindView(R.id.tv_content)
+// TextView tv_content;
+
+ private ActivityInfoDetailsBinding mBinding;
+
+ /**
+ * 初始化视图
+ */
+ @Override
+ public void initView() {
+ mBinding = DataBindingUtil.setContentView(this, R.layout.activity_info_details);
+
+ }
+
+ /**
+ * 初始化数据
+ */
+ @Override
+ public void initData() {
+ Intent intent = getIntent();
+ ArticleInfo articleInfo = (ArticleInfo) intent.getSerializableExtra("articleInfo");
+ mBinding.setArticleInfo(articleInfo);
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmActivity.java
new file mode 100644
index 0000000..b17c27c
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmActivity.java
@@ -0,0 +1,300 @@
+package com.uiuios.aios.activity.alarm;
+
+import android.content.Intent;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.trello.rxlifecycle4.RxLifecycle;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.R;
+import com.uiuios.aios.activity.alarmclock.AlarmClockAddActivity;
+import com.uiuios.aios.alarm.AlarmAdapter;
+import com.uiuios.aios.alarm.AlarmClockData;
+import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.dialog.DeleteDialog;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.utils.ToastUtil;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+
+public class AlarmActivity extends BaseActivity implements AlarmContact.AlarmView {
+ private static final String TAG = AlarmActivity.class.getSimpleName();
+
+ @BindView(R.id.cl_exit)
+ ConstraintLayout cl_exit;
+ @BindView(R.id.cl_all)
+ ConstraintLayout cl_all;
+ @BindView(R.id.cl_medicine)
+ ConstraintLayout cl_medicine;
+ @BindView(R.id.cl_look)
+ ConstraintLayout cl_look;
+ @BindView(R.id.cl_reserve)
+ ConstraintLayout cl_reserve;
+ @BindView(R.id.imageView1)
+ ImageView imageView1;
+ @BindView(R.id.imageView3)
+ ImageView imageView3;
+ @BindView(R.id.imageView5)
+ ImageView imageView5;
+ @BindView(R.id.imageView7)
+ ImageView imageView7;
+
+ @BindView(R.id.rv_data)
+ RecyclerView rv_data;
+ @BindView(R.id.cl_nodata)
+ ConstraintLayout cl_nodata;
+
+ @BindView(R.id.imageView2)
+ ImageView imageView2;
+ @BindView(R.id.imageView4)
+ ImageView imageView4;
+ @BindView(R.id.imageView6)
+ ImageView imageView6;
+ @BindView(R.id.imageView8)
+ ImageView imageView8;
+
+ @BindView(R.id.iv_add)
+ ImageView iv_add;
+
+ private AlarmPresenter mPresenter;
+ private AlarmAdapter mAlarmAdapter;
+ private int mType = 0;
+
+ /**
+ * 设置布局
+ */
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_alarm;
+ }
+
+ /**
+ * 初始化视图
+ */
+ @Override
+ public void initView() {
+ ButterKnife.bind(this);
+ mPresenter = new AlarmPresenter(this);
+ mPresenter.attachView(this);
+ mPresenter.setLifecycle(lifecycleSubject);
+
+ mAlarmAdapter = new AlarmAdapter();
+ mAlarmAdapter.setOnLongClickListener(new AlarmAdapter.OnLongClickListener() {
+ @Override
+ public void onLongClick(AlarmClockData alarmClockData) {
+ showDialog(alarmClockData);
+ }
+ });
+ rv_data.setLayoutManager(new LinearLayoutManager(AlarmActivity.this));
+ rv_data.setAdapter(mAlarmAdapter);
+ switchItem(0);
+ cl_exit.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ cl_all.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ switchItem(0);
+ mPresenter.getAlarmClock(mType);
+ }
+ });
+ cl_medicine.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ switchItem(1);
+ mPresenter.getAlarmClock(mType);
+ }
+ });
+ cl_look.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ switchItem(2);
+ mPresenter.getAlarmClock(mType);
+ }
+ });
+ cl_reserve.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ switchItem(3);
+ mPresenter.getAlarmClock(mType);
+ }
+ });
+
+ iv_add.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(AlarmActivity.this, AlarmClockAddActivity.class));
+ }
+ });
+ }
+
+ /**
+ * 初始化数据
+ */
+ @Override
+ public void initData() {
+ mPresenter.getAlarmClock(mType);
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mPresenter.getAlarmClock(mType);
+ }
+
+ private void switchItem(int position) {
+ mType = position;
+ cl_all.setBackground(null);
+ cl_medicine.setBackground(null);
+ cl_look.setBackground(null);
+ cl_reserve.setBackground(null);
+
+ imageView2.setImageDrawable(null);
+ imageView4.setImageDrawable(null);
+ imageView6.setImageDrawable(null);
+ imageView8.setImageDrawable(null);
+
+ switch (position) {
+ case 0:
+ default:
+// cl_all.setBackground(getDrawable(R.drawable.alarm_pressed_background));
+ imageView2.setImageDrawable(getDrawable(R.drawable.icon_touch));
+ imageView1.setImageDrawable(getDrawable(R.drawable.icon_alarm_all_pressed));
+ imageView3.setImageDrawable(getDrawable(R.drawable.icon_alarm_medicine));
+ imageView5.setImageDrawable(getDrawable(R.drawable.icon_alarm_look));
+ imageView7.setImageDrawable(getDrawable(R.drawable.icon_alarm_reserve));
+ break;
+ case 1:
+// cl_medicine.setBackground(getDrawable(R.drawable.alarm_pressed_background));
+ imageView4.setImageDrawable(getDrawable(R.drawable.icon_touch));
+ imageView1.setImageDrawable(getDrawable(R.drawable.icon_alarm_all));
+ imageView3.setImageDrawable(getDrawable(R.drawable.icon_alarm_medicine_pressed));
+ imageView5.setImageDrawable(getDrawable(R.drawable.icon_alarm_look));
+ imageView7.setImageDrawable(getDrawable(R.drawable.icon_alarm_reserve));
+ break;
+ case 2:
+// cl_look.setBackground(getDrawable(R.drawable.alarm_pressed_background));
+ imageView6.setImageDrawable(getDrawable(R.drawable.icon_touch));
+ imageView1.setImageDrawable(getDrawable(R.drawable.icon_alarm_all));
+ imageView3.setImageDrawable(getDrawable(R.drawable.icon_alarm_medicine));
+ imageView5.setImageDrawable(getDrawable(R.drawable.icon_alarm_look_pressed));
+ imageView7.setImageDrawable(getDrawable(R.drawable.icon_alarm_reserve));
+ break;
+ case 3:
+// cl_reserve.setBackground(getDrawable(R.drawable.alarm_pressed_background));
+ imageView8.setImageDrawable(getDrawable(R.drawable.icon_touch));
+ imageView1.setImageDrawable(getDrawable(R.drawable.icon_alarm_all));
+ imageView3.setImageDrawable(getDrawable(R.drawable.icon_alarm_medicine));
+ imageView5.setImageDrawable(getDrawable(R.drawable.icon_alarm_look));
+ imageView7.setImageDrawable(getDrawable(R.drawable.icon_alarm_reserve_pressed));
+ break;
+ }
+ }
+
+
+ private void showDialog(AlarmClockData alarmClockData) {
+ DeleteDialog dialog = new DeleteDialog(this);
+ dialog.setTitle("提醒")
+ .setMessage("是否要删除本次闹钟")
+ .setPositive("确定")
+ .setNegtive("取消")
+ .setOnClickBottomListener(new DeleteDialog.OnClickBottomListener() {
+ @Override
+ public void onPositiveClick() {
+ deleteAlarm(alarmClockData);
+ dialog.dismiss();
+ }
+
+ @Override
+ public void onNegtiveClick() {
+ dialog.dismiss();
+ }
+ });
+ dialog.show();
+ }
+
+ private void deleteAlarm(AlarmClockData alarmClockData) {
+ if (alarmClockData.isIs_local()) {
+ alarmClockData.setDeleted(true);
+ AlarmUtils.getInstance().deleteAlarmClock(alarmClockData);
+ mPresenter.getAlarmClock(mType);
+ } else {
+ NetInterfaceManager.getInstance().deleteAlarmClockObservable(alarmClockData.getId())
+ .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("deleteAlarm", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(@NonNull BaseResponse baseResponse) {
+ Log.e("deleteAlarm", "onNext: " + baseResponse);
+ if (baseResponse.code == 200) {
+ AlarmUtils.getInstance().deleteAlarmClock(alarmClockData);
+ ToastUtil.show("删除成功");
+ } else {
+ ToastUtil.show("删除失败:" + baseResponse.msg);
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("deleteAlarm", "onError: " + e.getMessage());
+ alarmClockData.setDeleted(true);
+ AlarmUtils.getInstance().updateAlarmClock(alarmClockData);
+ onComplete();
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("deleteAlarm", "onComplete: ");
+ mPresenter.getAlarmClock(mType);
+ }
+ });
+ }
+ }
+
+
+ @Override
+ public void setAlarmClock(List alarmClockData) {
+ List localAddAlarm = AlarmUtils.getInstance().getLocalAddAlarm();
+ Log.e(TAG, "setAlarmClock: localAddAlarm size = " + localAddAlarm);
+ if (alarmClockData != null) {
+ localAddAlarm.addAll(alarmClockData);
+ }
+ if (localAddAlarm.size() == 0) {
+ mAlarmAdapter.setAlarmClockData(null);
+// swipeRefreshLayout.setRefreshing(false);
+ cl_nodata.setVisibility(View.VISIBLE);
+ rv_data.setVisibility(View.GONE);
+ ToastUtil.show("没有数据");
+ } else {
+ mAlarmAdapter.setAlarmClockData(localAddAlarm);
+// swipeRefreshLayout.setRefreshing(false);
+ cl_nodata.setVisibility(View.GONE);
+ rv_data.setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void setAlarmClockEmpty() {
+
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmContact.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmContact.java
new file mode 100644
index 0000000..41d289f
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmContact.java
@@ -0,0 +1,21 @@
+package com.uiuios.aios.activity.alarm;
+
+import com.uiuios.aios.alarm.AlarmClockData;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
+
+import java.util.List;
+
+public class AlarmContact {
+ public interface Presenter extends BasePresenter {
+ void getAlarmClock();
+
+ void getAlarmClock(int type);
+ }
+
+ public interface AlarmView extends BaseView {
+ void setAlarmClock(List alarmClockData);
+
+ void setAlarmClockEmpty();
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmPresenter.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmPresenter.java
new file mode 100644
index 0000000..c7c0321
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmPresenter.java
@@ -0,0 +1,101 @@
+package com.uiuios.aios.activity.alarm;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.alarm.AlarmClockData;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.NetInterfaceManager;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
+public class AlarmPresenter implements AlarmContact.Presenter {
+ private static final String TAG = AlarmPresenter.class.getSimpleName();
+
+ private AlarmContact.AlarmView mView;
+ private Context mContext;
+
+ AlarmPresenter(Context context) {
+ this.mContext = context;
+ }
+
+ private BehaviorSubject lifecycle;
+
+ void setLifecycle(BehaviorSubject lifecycle) {
+ this.lifecycle = lifecycle;
+ }
+
+ public BehaviorSubject getLifecycle() {
+ return lifecycle;
+ }
+
+ @Override
+ public void attachView(@NonNull AlarmContact.AlarmView view) {
+ this.mView = view;
+ }
+
+ @Override
+ public void detachView() {
+ this.mView = null;
+ }
+
+
+ @Override
+ public void getAlarmClock() {
+ NetInterfaceManager.getInstance().getAlarmClock(true, getLifecycle(), new NetInterfaceManager.AlarmClockCallback() {
+ @Override
+ public void setAlarmClock(List alarmClockList) {
+ if (alarmClockList.size() == 0) {
+ setAlarmClockEmpty();
+ } else {
+
+ }
+ }
+
+ @Override
+ public void setAlarmClockEmpty() {
+
+ }
+
+ @Override
+ public void onError() {
+
+ }
+ });
+ }
+
+ @Override
+ public void getAlarmClock(int type) {
+ Log.e(TAG, "getAlarmClock: " + type);
+ NetInterfaceManager.getInstance().getAlarmClockObservable(type)
+ .subscribe(new Observer>>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("getAlarmClock", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(@NonNull BaseResponse> listBaseResponse) {
+ Log.e("getAlarmClock", "onNext: " + listBaseResponse);
+ mView.setAlarmClock(listBaseResponse.data);
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("getAlarmClock", "onError: " + e.getMessage());
+ onComplete();
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("getAlarmClock", "onComplete: ");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockActivity.java
similarity index 98%
rename from app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockActivity.java
index 5f3b1b9..ec4a673 100644
--- a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockActivity.java
@@ -1,4 +1,4 @@
-package com.uiuios.aios.activity.alarm;
+package com.uiuios.aios.activity.alarmclock;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -56,7 +56,7 @@ public class AlarmClockActivity extends BaseLifecycleActivity implements AlarmCl
@Override
public int getLayoutId() {
- return R.layout.activity_alarm_clock;
+ return R.layout.activity_alarm;
}
@Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockAddActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockAddActivity.java
similarity index 72%
rename from app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockAddActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockAddActivity.java
index 5e7f6c0..d8a02b2 100644
--- a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockAddActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockAddActivity.java
@@ -1,5 +1,6 @@
-package com.uiuios.aios.activity.alarm;
+package com.uiuios.aios.activity.alarmclock;
+import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.text.TextUtils;
@@ -7,7 +8,6 @@ import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ImageView;
@@ -30,33 +30,19 @@ import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.interfaces.OnResultCallbackListener;
import com.shehuan.niv.NiceImageView;
-import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.R;
import com.uiuios.aios.alarm.AlarmClockData;
import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.base.BaseLifecycleActivity;
import com.uiuios.aios.base.GlideEngine;
-import com.uiuios.aios.bean.AlarmClockId;
-import com.uiuios.aios.bean.BaseResponse;
-import com.uiuios.aios.manager.RemoteManager;
-import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.service.main.MainService;
import com.uiuios.aios.utils.FFmpegUtils;
import com.uiuios.aios.utils.FileUtil;
import com.uiuios.aios.utils.ScreenUtil;
import com.uiuios.aios.utils.TimeUtils;
import com.uiuios.aios.utils.ToastUtil;
import com.uiuios.aios.utils.Utils;
-import com.uiuios.aios.R;
-import com.uiuios.aios.alarm.AlarmClockData;
-import com.uiuios.aios.alarm.AlarmUtils;
-import com.uiuios.aios.base.BaseLifecycleActivity;
-import com.uiuios.aios.base.GlideEngine;
-import com.uiuios.aios.bean.AlarmClockId;
-import com.uiuios.aios.bean.BaseResponse;
-import com.uiuios.aios.network.NetInterfaceManager;
-import com.uiuios.aios.utils.FileUtil;
-import com.uiuios.aios.utils.ToastUtil;
-import com.uiuios.aios.utils.Utils;
-import com.xiasuhuei321.loadingdialog.view.LoadingDialog;
import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
import java.io.File;
@@ -96,10 +82,6 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
NiceImageView nv_pic;
@BindView(R.id.iv_back)
ImageView iv_back;
- @BindView(R.id.bt_confirm)
- Button bt_confirm;
- @BindView(R.id.bt_cancel)
- Button bt_cancel;
@BindView(R.id.tv_duration)
TextView tv_duration;
@@ -107,10 +89,15 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
RadioButton rb1;
@BindView(R.id.rb2)
RadioButton rb2;
- @BindView(R.id.rb3)
- RadioButton rb3;
- @BindView(R.id.rb4)
- RadioButton rb4;
+ @BindView(R.id.rb_all)
+ RadioButton rb_all;
+ @BindView(R.id.rb_look)
+ RadioButton rb_look;
+ @BindView(R.id.rb_reserve)
+ RadioButton rb_reserve;
+
+ @BindView(R.id.iv_add)
+ ImageView iv_add;
private PopupWindow mPopupWindow;
@@ -118,11 +105,13 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
private String mPictrueFilePath;
private Date mDate;
/*类型 1一次性 2每天 3周一到周五 4周六周日*/
- private int mType = 1;
+ private int mDayType = 1;
+ private int mClockType = 1;
+
@Override
public int getLayoutId() {
- return R.layout.activity_add_alarm_clock;
+ return R.layout.activity_add_alarm;
}
@Override
@@ -136,14 +125,14 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
ButterKnife.bind(this);
initTimePicker();
-
+ rb1.setChecked(true);
rb1.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if (b) {
+ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+ if (isChecked) {
ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
rb1.setTextColor(colorStateList);
- mType = 1;
+ mDayType = 1;
} else {
ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
rb1.setTextColor(colorStateList);
@@ -152,45 +141,50 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
});
rb2.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if (b) {
+ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+ if (isChecked) {
ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
rb2.setTextColor(colorStateList);
- mType = 2;
+ mDayType = 2;
} else {
ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
rb2.setTextColor(colorStateList);
}
}
});
- rb3.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ rb_all.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if (b) {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
- rb3.setTextColor(colorStateList);
- mType = 3;
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ mClockType = 1;
+ et_activation.setText("用药闹钟");
} else {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
- rb3.setTextColor(colorStateList);
- }
- }
- });
- rb4.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if (b) {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
- rb4.setTextColor(colorStateList);
- mType = 4;
- } else {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
- rb4.setTextColor(colorStateList);
- }
- }
- });
- rb1.setChecked(true);
+ }
+ }
+ });
+ rb_look.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ mClockType = 2;
+ et_activation.setText("接送闹钟");
+ } else {
+
+ }
+ }
+ });
+ rb_reserve.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ mClockType = 3;
+ et_activation.setText("预约闹钟");
+ } else {
+
+ }
+ }
+ });
cl_pic.setOnClickListener(new View.OnClickListener() {
@Override
@@ -210,18 +204,12 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
openSelector();
}
});
- bt_confirm.setOnClickListener(new View.OnClickListener() {
+ iv_add.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkContent();
}
});
- bt_cancel.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- finish();
- }
- });
iv_back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -247,7 +235,7 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
tvMenuOne.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 1;
+ mDayType = 1;
tv_type.setText("只响一次");
mPopupWindow.dismiss();
}
@@ -255,7 +243,7 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
tvMenuTwo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 2;
+ mDayType = 2;
tv_type.setText("每天");
mPopupWindow.dismiss();
}
@@ -263,7 +251,7 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
tvMenuThree.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 3;
+ mDayType = 3;
tv_type.setText("周一至周五");
mPopupWindow.dismiss();
}
@@ -271,7 +259,7 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
tvMenuFour.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 4;
+ mDayType = 4;
tv_type.setText("周六至周日");
mPopupWindow.dismiss();
}
@@ -288,7 +276,7 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
}
}
- LoadingDialog mLoadingDialog;
+// LoadingDialog mLoadingDialog;
private void checkContent() {
@@ -310,80 +298,83 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
MediaType mediaType = MediaType.Companion.parse("image/png");
RequestBody requestBody = RequestBody.Companion.create(picFile, mediaType);
MultipartBody.Part body = MultipartBody.Part.createFormData("file", picFile.getName(), requestBody);
+
AlarmClockData alarmClockData = new AlarmClockData();
alarmClockData.setFile(mPictrueFilePath);
- alarmClockData.setType(mType);
+ alarmClockData.setType(mDayType);
alarmClockData.setTime(timeStamp);
alarmClockData.setTitle(et_activation.getText().toString());
alarmClockData.setRemind_type(0);
alarmClockData.setIs_onoff(1);
+ alarmClockData.setClazz(mClockType);
Map params = new HashMap<>();
- params.put("sn", RemoteManager.getInstance().getSerial());
+ params.put("sn", Utils.getSerial());
params.put("time", timeStamp);
- params.put("type", String.valueOf(mType));
+ params.put("type", String.valueOf(mDayType));
params.put("title", et_activation.getText().toString());
params.put("remind_type", "0");
params.put("is_onoff", "1");
+ params.put("class", String.valueOf(mClockType));
- mLoadingDialog = new LoadingDialog(this);
- mLoadingDialog.setLoadingText("正在上传")
- .setSuccessText("添加成功")
- .setFailedText("添加失败")
- .setInterceptBack(true)
- .setLoadSpeed(LoadingDialog.Speed.SPEED_ONE)
- .closeSuccessAnim()
- .show();
+// mLoadingDialog = new LoadingDialog(this);
+// mLoadingDialog.setLoadingText("正在上传")
+// .setSuccessText("添加成功")
+// .setFailedText("添加失败")
+// .setInterceptBack(true)
+// .setLoadSpeed(LoadingDialog.Speed.SPEED_ONE)
+// .closeSuccessAnim()
+// .show();
- NetInterfaceManager.getInstance().getAlarmClockAddObservable(params, body)
- .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(@NonNull Disposable d) {
- Log.e("checkContent", "onSubscribe: ");
- bt_confirm.setEnabled(false);
- }
+ ThreadLocalRandom random = ThreadLocalRandom.current();
+ int fakeId = random.nextInt(Integer.MAX_VALUE);
+ Log.e(TAG, "checkContent: fakeId = " + fakeId);
+ alarmClockData.setId(fakeId);
+ alarmClockData.setIs_local(true);
+ Log.e(TAG, "checkContent: addAlarmClock = " + AlarmUtils.getInstance().addAlarmClock(alarmClockData));
+ ToastUtil.show("添加成功");
+ Intent intent = new Intent(MainService.uploadAlarmClockReceiver.UPLOAD_ALARM_RECEIVER_ACTION);
+ sendBroadcast(intent);
+ finish();
- @Override
- public void onNext(@NonNull BaseResponse baseResponse) {
- Log.e("checkContent", "onNext: " + baseResponse);
- if (baseResponse.code == 200) {
- ToastUtil.show("添加成功");
-// int id = baseResponse.data.getId();
-// alarmClockData.setId(id);
-// AlarmUtils.getInstance().addAlarmClock(alarmClockData);
- mLoadingDialog.loadSuccess();
- mLoadingDialog.close();
- finish();
- } else {
- ToastUtil.show("添加失败:" + baseResponse.msg);
- bt_confirm.setEnabled(true);
- mLoadingDialog.loadFailed();
- }
- }
-
- @Override
- public void onError(@NonNull Throwable e) {
- Log.e("checkContent", "onError: " + e.getMessage());
- ToastUtil.show("已保存到本地");
- ThreadLocalRandom random = ThreadLocalRandom.current();
- int fakeId = random.nextInt(Integer.MAX_VALUE);
- Log.e(TAG, "onError: fakeId = " + fakeId);
- alarmClockData.setId(fakeId);
- alarmClockData.setIs_local(true);
- Log.e(TAG, "onError: addAlarmClock = " + AlarmUtils.getInstance().addAlarmClock(alarmClockData));
-
- onComplete();
- finish();
- }
-
- @Override
- public void onComplete() {
- Log.e("checkContent", "onComplete: ");
- mLoadingDialog.close();
- bt_confirm.setEnabled(true);
- }
- });
+// NetInterfaceManager.getInstance().getAlarmClockAddObservable(params, body)
+// .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+// .subscribe(new Observer>() {
+// @Override
+// public void onSubscribe(@NonNull Disposable d) {
+// Log.e("addAlarmClock", "onSubscribe: ");
+// iv_add.setEnabled(false);
+// }
+//
+// @Override
+// public void onNext(@NonNull BaseResponse baseResponse) {
+// Log.e("addAlarmClock", "onNext: " + baseResponse);
+// if (baseResponse.code == 200) {
+// ToastUtil.show("添加成功");
+//// int id = baseResponse.data.getId();
+//// alarmClockData.setId(id);
+//// AlarmUtils.getInstance().addAlarmClock(alarmClockData);
+// finish();
+// } else {
+// ToastUtil.show("添加失败:" + baseResponse.msg);
+// iv_add.setEnabled(true);
+// }
+// }
+//
+// @Override
+// public void onError(@NonNull Throwable e) {
+// Log.e("addAlarmClock", "onError: " + e.getMessage());
+// ToastUtil.show("已保存到本地");
+// onComplete();
+// finish();
+// }
+//
+// @Override
+// public void onComplete() {
+// Log.e("addAlarmClock", "onComplete: ");
+// iv_add.setEnabled(true);
+// }
+// });
}
private void openSelector() {
@@ -485,7 +476,7 @@ public class AlarmClockAddActivity extends BaseLifecycleActivity {
private String getTime(Date date) {
SimpleDateFormat format;
- if (mType == 1) {
+ if (mDayType == 1) {
format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
} else {
format = new SimpleDateFormat("HH:mm");
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockContact.java
similarity index 91%
rename from app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java
rename to app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockContact.java
index d4c911d..e5bd46a 100644
--- a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockContact.java
@@ -1,4 +1,4 @@
-package com.uiuios.aios.activity.alarm;
+package com.uiuios.aios.activity.alarmclock;
import com.uiuios.aios.base.BasePresenter;
import com.uiuios.aios.base.BaseView;
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockEditActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockEditActivity.java
similarity index 74%
rename from app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockEditActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockEditActivity.java
index 04a56e2..7050baf 100644
--- a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockEditActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockEditActivity.java
@@ -1,4 +1,4 @@
-package com.uiuios.aios.activity.alarm;
+package com.uiuios.aios.activity.alarmclock;
import android.content.Intent;
import android.content.res.ColorStateList;
@@ -9,7 +9,6 @@ import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ImageView;
@@ -46,7 +45,6 @@ import com.uiuios.aios.alarm.AlarmClockData;
import com.uiuios.aios.alarm.AlarmUtils;
import com.uiuios.aios.base.GlideEngine;
import com.uiuios.aios.bean.BaseResponse;
-import com.uiuios.aios.manager.RemoteManager;
import com.uiuios.aios.network.NetInterfaceManager;
import com.uiuios.aios.utils.FFmpegUtils;
import com.uiuios.aios.utils.FileUtil;
@@ -99,12 +97,6 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
NiceImageView nv_pic;
@BindView(R.id.iv_back)
ImageView iv_back;
- @BindView(R.id.bt_confirm)
- Button bt_confirm;
- @BindView(R.id.bt_cancel)
- Button bt_cancel;
- @BindView(R.id.tv_title)
- TextView tv_title;
@BindView(R.id.tv_duration)
TextView tv_duration;
@@ -112,10 +104,15 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
RadioButton rb1;
@BindView(R.id.rb2)
RadioButton rb2;
- @BindView(R.id.rb3)
- RadioButton rb3;
- @BindView(R.id.rb4)
- RadioButton rb4;
+ @BindView(R.id.rb_all)
+ RadioButton rb_all;
+ @BindView(R.id.rb_look)
+ RadioButton rb_look;
+ @BindView(R.id.rb_reserve)
+ RadioButton rb_reserve;
+
+ @BindView(R.id.iv_add)
+ ImageView iv_add;
private PopupWindow mMenuPopupWindow;
@@ -124,7 +121,8 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
private Date mDate;
/*类型 1一次性 2每天 3周一到周五 4周六周日*/
- private int mType = 1;
+ private int mDayType = 1;
+ private int mClockType = 1;
private int mId;
private AlarmClockData mAlarmClockData;
@@ -187,7 +185,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_add_alarm_clock);
+ setContentView(R.layout.activity_add_alarm);
lifecycleSubject.onNext(ActivityEvent.CREATE);
UltimateBarX.statusBarOnly(this)
.colorRes(R.color.default_blue)
@@ -199,7 +197,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
private void initView() {
ButterKnife.bind(this);
- tv_title.setText("编辑闹钟");
+// tv_title.setText("编辑闹钟");
initTimePicker();
cl_pic.setOnClickListener(new View.OnClickListener() {
@@ -220,18 +218,6 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
openSelector();
}
});
- bt_confirm.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- checkContent();
- }
- });
- bt_cancel.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- finish();
- }
- });
iv_back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -244,7 +230,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
if (b) {
ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
rb1.setTextColor(colorStateList);
- mType = 1;
+ mDayType = 1;
} else {
ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
rb1.setTextColor(colorStateList);
@@ -257,39 +243,50 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
if (b) {
ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
rb2.setTextColor(colorStateList);
- mType = 2;
+ mDayType = 2;
} else {
ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
rb2.setTextColor(colorStateList);
}
}
});
- rb3.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+
+ rb_all.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if (b) {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
- rb3.setTextColor(colorStateList);
- mType = 3;
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ mClockType = 1;
} else {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
- rb3.setTextColor(colorStateList);
+
}
}
});
- rb4.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ rb_look.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if (b) {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
- rb4.setTextColor(colorStateList);
- mType = 4;
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ mClockType = 2;
} else {
- ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
- rb4.setTextColor(colorStateList);
+
}
}
});
+ rb_reserve.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ mClockType = 3;
+ } else {
+
+ }
+ }
+ });
+ iv_add.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ checkContent();
+ }
+ });
}
private void initData() {
@@ -305,38 +302,45 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
finish();
return;
}
- NetInterfaceManager.getInstance().getAlarmClockByIdObservable(mId)
- .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(@NonNull Disposable d) {
- Log.e("getAlarmClockById", "onSubscribe: ");
- }
-
- @Override
- public void onNext(@NonNull BaseResponse alarmClockDatabaseResponse) {
- Log.e("getAlarmClockById", "onNext: " + alarmClockDatabaseResponse);
- if (alarmClockDatabaseResponse.code == 200) {
- AlarmClockData alarmClockData = alarmClockDatabaseResponse.data;
- mAlarmClockData = alarmClockData;
- setAlarmClockInfo(alarmClockData);
+ HashMap clockDataHashMap = AlarmUtils.getInstance().getOldDataMap();
+ AlarmClockData alarmClockData = clockDataHashMap.get(mId);
+ if (alarmClockData == null || !alarmClockData.isIs_local()) {
+ NetInterfaceManager.getInstance().getAlarmClockByIdObservable(mId)
+ .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("getAlarmClockById", "onSubscribe: ");
}
- }
- @Override
- public void onError(@NonNull Throwable e) {
- Log.e("getAlarmClockById", "onError: " + e.getMessage());
- HashMap oldData = AlarmUtils.getInstance().getOldDataMap();
- mAlarmClockData = oldData.get(mId);
- setAlarmClockInfo(mAlarmClockData);
- onComplete();
- }
+ @Override
+ public void onNext(@NonNull BaseResponse alarmClockDatabaseResponse) {
+ Log.e("getAlarmClockById", "onNext: " + alarmClockDatabaseResponse);
+ if (alarmClockDatabaseResponse.code == 200) {
+ AlarmClockData alarmClockData = alarmClockDatabaseResponse.data;
+ mAlarmClockData = alarmClockData;
+ setAlarmClockInfo(alarmClockData);
+ }
+ }
- @Override
- public void onComplete() {
- Log.e("getAlarmClockById", "onComplete: ");
- }
- });
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("getAlarmClockById", "onError: " + e.getMessage());
+ HashMap oldData = AlarmUtils.getInstance().getOldDataMap();
+ mAlarmClockData = oldData.get(mId);
+ setAlarmClockInfo(mAlarmClockData);
+ onComplete();
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("getAlarmClockById", "onComplete: ");
+ }
+ });
+ } else {
+ mAlarmClockData = alarmClockData;
+ setAlarmClockInfo(mAlarmClockData);
+ }
}
private void setAlarmClockInfo(AlarmClockData alarmClockData) {
@@ -345,24 +349,37 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
return;
}
Log.e(TAG, "setAlarmClockInfo: " + alarmClockData);
- mType = alarmClockData.getType();
- switch (mType) {
+ mDayType = alarmClockData.getType();
+ switch (mDayType) {
default:
case AlarmUtils.ONCE:
rb1.setChecked(true);
- tv_type.setText("只响一次");
+// tv_type.setText("只响一次");
break;
case AlarmUtils.LOOP:
rb2.setChecked(true);
- tv_type.setText("每天");
+// tv_type.setText("每天");
break;
- case AlarmUtils.WORKING_DAY:
- rb3.setChecked(true);
- tv_type.setText("周一至周五");
+// case AlarmUtils.WORKING_DAY:
+// rb3.setChecked(true);
+// tv_type.setText("周一至周五");
+// break;
+// case AlarmUtils.OFF_DAY:
+// rb4.setChecked(true);
+// tv_type.setText("周六至周日");
+// break;
+ }
+ mClockType = alarmClockData.getClazz();
+ switch (mClockType) {
+ case 1:
+ default:
+ rb_all.setChecked(true);
break;
- case AlarmUtils.OFF_DAY:
- rb4.setChecked(true);
- tv_type.setText("周六至周日");
+ case 2:
+ rb_look.setChecked(true);
+ break;
+ case 3:
+ rb_reserve.setChecked(true);
break;
}
String time = alarmClockData.getTime();
@@ -423,23 +440,26 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
}
mAlarmClockData.setId(mId);
- mAlarmClockData.setType(mType);
+ mAlarmClockData.setType(mDayType);
mAlarmClockData.setTime(timeStamp);
mAlarmClockData.setTitle(et_activation.getText().toString());
mAlarmClockData.setFile(mPictrueFilePath);
mAlarmClockData.setRemind_type(0);
mAlarmClockData.setIs_onoff(1);
mAlarmClockData.setFinished(false);
+ mAlarmClockData.setClazz(mClockType);
Map params = new HashMap<>();
- params.put("sn", RemoteManager.getInstance().getSerial());
+ params.put("sn", Utils.getSerial());
params.put("id", String.valueOf(mId));
- params.put("type", String.valueOf(mType));
+ params.put("type", String.valueOf(mDayType));
params.put("time", timeStamp);
params.put("title", et_activation.getText().toString());
params.put("remind_type", "0");
params.put("is_onoff", "1");
+ params.put("class", String.valueOf(mClockType));
+
mLoadingDialog = new LoadingDialog(this);
mLoadingDialog.setLoadingText("正在上传")
@@ -450,48 +470,57 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
.closeSuccessAnim()
.show();
- NetInterfaceManager.getInstance().getAlarmClockEditObservable(params, body)
- .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(@NonNull Disposable d) {
- Log.e("checkContent", "onSubscribe: ");
- ToastUtil.show("正在上传");
- bt_confirm.setEnabled(false);
- }
-
- @Override
- public void onNext(@NonNull BaseResponse baseResponse) {
- Log.e("checkContent", "onNext: " + baseResponse);
- if (baseResponse.code == 200) {
- ToastUtil.show("编辑成功");
- mLoadingDialog.loadSuccess();
- mLoadingDialog.close();
- mAlarmClockData.setEdited(false);
- AlarmUtils.getInstance().updateAlarmClock(mAlarmClockData);
- finish();
- } else {
- ToastUtil.show("编辑失败:" + baseResponse.msg);
- mLoadingDialog.loadFailed();
+ if (mAlarmClockData.isIs_local()) {
+ ToastUtil.show("编辑成功");
+ mLoadingDialog.loadSuccess();
+ mLoadingDialog.close();
+ mAlarmClockData.setEdited(false);
+ AlarmUtils.getInstance().updateAlarmClock(mAlarmClockData);
+ finish();
+ } else {
+ NetInterfaceManager.getInstance().getAlarmClockEditObservable(params, body)
+ .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("checkContent", "onSubscribe: ");
+ ToastUtil.show("正在上传");
+ iv_add.setEnabled(false);
}
- }
- @Override
- public void onError(@NonNull Throwable e) {
- Log.e("checkContent", "onError: " + e.getMessage());
- mAlarmClockData.setEdited(true);
- AlarmUtils.getInstance().updateAlarmClock(mAlarmClockData);
- onComplete();
- }
+ @Override
+ public void onNext(@NonNull BaseResponse baseResponse) {
+ Log.e("checkContent", "onNext: " + baseResponse);
+ if (baseResponse.code == 200) {
+ ToastUtil.show("编辑成功");
+ mLoadingDialog.loadSuccess();
+ mLoadingDialog.close();
+ mAlarmClockData.setEdited(false);
+ AlarmUtils.getInstance().updateAlarmClock(mAlarmClockData);
+ finish();
+ } else {
+ ToastUtil.show("编辑失败:" + baseResponse.msg);
+ mLoadingDialog.loadFailed();
+ }
+ }
- @Override
- public void onComplete() {
- Log.e("checkContent", "onComplete: ");
- bt_confirm.setEnabled(true);
- finish();
- mLoadingDialog.close();
- }
- });
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("checkContent", "onError: " + e.getMessage());
+ mAlarmClockData.setEdited(true);
+ AlarmUtils.getInstance().updateAlarmClock(mAlarmClockData);
+ onComplete();
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("checkContent", "onComplete: ");
+ iv_add.setEnabled(true);
+ finish();
+ mLoadingDialog.close();
+ }
+ });
+ }
}
@@ -507,7 +536,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
tvMenuOne.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 1;
+ mDayType = 1;
tv_type.setText("只响一次");
mMenuPopupWindow.dismiss();
}
@@ -515,7 +544,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
tvMenuTwo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 2;
+ mDayType = 2;
tv_type.setText("每天");
mMenuPopupWindow.dismiss();
}
@@ -523,7 +552,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
tvMenuThree.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 3;
+ mDayType = 3;
tv_type.setText("周一至周五");
mMenuPopupWindow.dismiss();
}
@@ -531,7 +560,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
tvMenuFour.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- mType = 4;
+ mDayType = 4;
tv_type.setText("周六至周日");
mMenuPopupWindow.dismiss();
}
@@ -612,7 +641,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
startDate.set(2013, 0, 23);
Calendar endDate = Calendar.getInstance();
- endDate.set(2019, 11, 28);
+ endDate.set(2099, 11, 28);
//时间选择器
pvTime = new TimePickerBuilder(this, new OnTimeSelectListener() {
@@ -647,7 +676,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
private String getTime(Date date) {
SimpleDateFormat format;
- if (mType == 1) {
+ if (mDayType == 1) {
format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
} else {
format = new SimpleDateFormat("HH:mm");
@@ -658,7 +687,7 @@ public class AlarmClockEditActivity extends AppCompatActivity implements Lifecyc
private Calendar getTime(String timeString) {
SimpleDateFormat sdf;
Calendar calendar = Calendar.getInstance();
- if (mType == 1) {
+ if (mDayType == 1) {
sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
} else {
sdf = new SimpleDateFormat("HH:mm");
diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockPresenter.java
similarity index 97%
rename from app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java
rename to app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockPresenter.java
index 453d9fd..40b31f6 100644
--- a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarmclock/AlarmClockPresenter.java
@@ -1,4 +1,4 @@
-package com.uiuios.aios.activity.alarm;
+package com.uiuios.aios.activity.alarmclock;
import android.content.Context;
diff --git a/app/src/main/java/com/uiuios/aios/activity/location/LocationAcivity.java b/app/src/main/java/com/uiuios/aios/activity/location/LocationAcivity.java
new file mode 100644
index 0000000..681cf0b
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/location/LocationAcivity.java
@@ -0,0 +1,228 @@
+package com.uiuios.aios.activity.location;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.CityAdapter;
+import com.uiuios.aios.adapter.DistrictAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.AddressBean;
+import com.uiuios.aios.manager.RemoteManager;
+import com.uiuios.aios.view.RecyclerViewSpacesItemDecoration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class LocationAcivity extends BaseActivity implements LocationContact.LocationView, CityAdapter.CityCallback, DistrictAdapter.DistrictCallback {
+
+ @BindView(R.id.bg)
+ ConstraintLayout bg;
+ @BindView(R.id.root)
+ ConstraintLayout root;
+ @BindView(R.id.rv_area)
+ RecyclerView rv_area;
+
+ @BindView(R.id.edit_search)
+ EditText edit_search;
+ @BindView(R.id.rv_city)
+ RecyclerView rv_city;
+ @BindView(R.id.cl_location)
+ ConstraintLayout cl_location;
+
+ private List popularCities = new ArrayList() {{
+ this.add(new AddressBean("北京"));
+ this.add(new AddressBean("上海"));
+ this.add(new AddressBean("深圳"));
+ this.add(new AddressBean("广州"));
+ this.add(new AddressBean("武汉"));
+ this.add(new AddressBean("长沙"));
+ this.add(new AddressBean("南京"));
+ this.add(new AddressBean("苏州"));
+ this.add(new AddressBean("西安"));
+ this.add(new AddressBean("济南"));
+ this.add(new AddressBean("青岛"));
+ this.add(new AddressBean("沈阳"));
+ this.add(new AddressBean("重庆"));
+ this.add(new AddressBean("郑州"));
+ this.add(new AddressBean("成都"));
+ this.add(new AddressBean("杭州"));
+ this.add(new AddressBean("厦门"));
+ }};
+
+ private LocationPresenter mPresenter;
+ private CityAdapter mCityAdapter;
+ private DistrictAdapter mDistrictAdapter;
+
+ private List mDistrict;
+ private AddressBean mAddressBean;
+
+ /**
+ * 设置布局
+ */
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_location;
+ }
+
+ /**
+ * 初始化视图
+ */
+ @Override
+ public void initView() {
+ ButterKnife.bind(this);
+ mPresenter = new LocationPresenter(this);
+ mPresenter.attachView(this);
+ mPresenter.setLifecycle(lifecycleSubject);
+ bg.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ finish();
+ }
+ });
+ root.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ rv_area.setVisibility(View.GONE);
+ }
+ });
+ cl_location.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ mAddressBean = new AddressBean(RemoteManager.getInstance().getDistrict());
+ setIntent();
+ }
+ });
+ edit_search.setImeOptions(EditorInfo.IME_ACTION_SEARCH);
+ edit_search.setInputType(EditorInfo.TYPE_CLASS_TEXT);
+ edit_search.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+ @Override
+ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+ if (actionId == EditorInfo.IME_ACTION_SEND ||
+ (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+ switch (event.getAction()) {
+ case KeyEvent.ACTION_UP:
+ //do it
+ if (actionId == EditorInfo.IME_ACTION_SEND || (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+ //do something;
+ ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE))
+ .hideSoftInputFromWindow(LocationAcivity.this.getCurrentFocus()
+ .getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+ String text = edit_search.getText().toString();
+ checkContent(text);
+ }
+ return true;
+ default:
+ return true;
+ }
+ }
+ return false;
+ }
+ });
+ }
+
+ private void checkContent(String text) {
+ if (TextUtils.isEmpty(text)) {
+ rv_area.setVisibility(View.GONE);
+ } else {
+ rv_area.setVisibility(View.VISIBLE);
+ List area = mDistrict.stream().filter(new Predicate() {
+ @Override
+ public boolean test(AddressBean addressBean) {
+ return addressBean.toString().contains(text);
+ }
+ }).collect(Collectors.toList());
+ mDistrictAdapter.setDistrict(area);
+ }
+ }
+
+ /**
+ * 初始化数据
+ */
+ @Override
+ public void initData() {
+ HashMap stringIntegerHashMap = new HashMap<>();
+ WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+ DisplayMetrics dm = new DisplayMetrics();
+ wm.getDefaultDisplay().getRealMetrics(dm);
+ float density = dm.density; // 屏幕密度（0.75 / 1.0 / 1.5）
+ stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, (int) (density * 4));//top间距
+ stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, (int) (density * 4));//底部间距
+ stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, (int) (density * 30));//左间距
+ stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, (int) (density * 30));//右间距
+ rv_city.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
+ mCityAdapter = new CityAdapter();
+ mCityAdapter.setCityList(popularCities);
+ mCityAdapter.setCityCallback(this::onCitySelected);
+ rv_city.setLayoutManager(new GridLayoutManager(this, 3));
+ rv_city.setAdapter(mCityAdapter);
+
+ mDistrictAdapter = new DistrictAdapter();
+ mDistrictAdapter.setDistrictCallback(this::onDistrictSelected);
+ LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+ linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+ rv_area.setLayoutManager(linearLayoutManager);
+ rv_area.setAdapter(mDistrictAdapter);
+
+ mPresenter.initJsonData();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ mPresenter.detachView();
+ }
+
+ @Override
+ public void setJsonData(List area) {
+ this.mDistrict = area;
+ mDistrictAdapter.setDistrict(area);
+ }
+
+ @Override
+ public void onDistrictSelected(AddressBean addressBean) {
+ mAddressBean = addressBean;
+ setIntent();
+ }
+
+ @Override
+ public void onCitySelected(AddressBean addressBean) {
+ mAddressBean = addressBean;
+ setIntent();
+ }
+
+ private void setIntent() {
+ Intent intent = new Intent();
+ Bundle bundle = new Bundle();
+ bundle.putString("address", mAddressBean.toString());
+ bundle.putString("district", mAddressBean.getDistrict());
+ intent.putExtras(bundle);
+ // 携带意图返回上一个页面 RESULT_OK代表处理成功了
+ setResult(Activity.RESULT_OK, intent);
+ // 结束当前页面
+ finish();
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/location/LocationContact.java b/app/src/main/java/com/uiuios/aios/activity/location/LocationContact.java
new file mode 100644
index 0000000..70cba09
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/location/LocationContact.java
@@ -0,0 +1,17 @@
+package com.uiuios.aios.activity.location;
+
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
+import com.uiuios.aios.bean.AddressBean;
+
+import java.util.List;
+
+public class LocationContact {
+ interface Presenter extends BasePresenter {
+ void initJsonData();
+ }
+
+ public interface LocationView extends BaseView {
+ void setJsonData(List area);
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/location/LocationPresenter.java b/app/src/main/java/com/uiuios/aios/activity/location/LocationPresenter.java
new file mode 100644
index 0000000..52e9820
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/activity/location/LocationPresenter.java
@@ -0,0 +1,122 @@
+package com.uiuios.aios.activity.location;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.gson.Gson;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.bean.AddressBean;
+import com.uiuios.aios.bean.JsonBean;
+import com.uiuios.aios.gson.GetJsonDataUtil;
+
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
+public class LocationPresenter implements LocationContact.Presenter {
+ private Context mContext;
+
+
+ LocationPresenter(Context context) {
+ this.mContext = context;
+ }
+
+ private LocationContact.LocationView mView;
+
+ private BehaviorSubject lifecycle;
+
+ public void setLifecycle(BehaviorSubject lifecycle) {
+ this.lifecycle = lifecycle;
+ }
+
+ public BehaviorSubject getLifecycle() {
+ return lifecycle;
+ }
+
+ @Override
+ public void attachView(LocationContact.LocationView view) {
+ this.mView = view;
+ }
+
+ @Override
+ public void detachView() {
+ this.mView = null;
+ }
+
+
+ @Override
+ public void initJsonData() {
+ long time = System.currentTimeMillis();
+ Observable.create(new ObservableOnSubscribe>() {
+ @Override
+ public void subscribe(@NonNull ObservableEmitter> emitter) throws Throwable {
+ List areaList = new ArrayList<>();
+ String JsonData = new GetJsonDataUtil().getJson(mContext, "province.json");//获取assets目录下的json文件数据
+ ArrayList jsonBeanList = parseData(JsonData);//用Gson 转成实体
+ for (JsonBean jsonBean : jsonBeanList) {//遍历省份
+ String province = jsonBean.getName();
+ for (JsonBean.CityBean cityBean : jsonBean.getCityList()) {//遍历该省份的所有城市
+ String city = cityBean.getName();
+ for (String district : cityBean.getArea()) {//遍历该省份的所有城市
+ areaList.add(new AddressBean(province , city , district));
+ }
+ }
+ }
+ emitter.onNext(areaList);
+ }
+ }).subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ Log.e("initJsonData", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(List s) {
+ Log.e("initJsonData", "onNext: ");
+ Log.e("initJsonData", "initdatetime = " + (System.currentTimeMillis() - time) + "ms");
+ mView.setJsonData(s);
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ Log.e("initJsonData", "onError: " + e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("initJsonData", "onComplete: ");
+ }
+ });
+
+
+ }
+
+
+ public ArrayList parseData(String result) {//Gson 解析
+ ArrayList detail = new ArrayList<>();
+ try {
+ JSONArray data = new JSONArray(result);
+ Gson gson = new Gson();
+ for (int i = 0; i < data.length(); i++) {
+ JsonBean entity = gson.fromJson(data.optJSONObject(i).toString(), JsonBean.class);
+ detail.add(entity);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return detail;
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
index b265a9f..00fc6ae 100644
--- a/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
@@ -81,11 +81,11 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
private ControlFragment mControlFragment;
private HomeFragment mHomeFragment;
// private CustomFragment mCustomFragment;
-// private SecondFragment mSecondFragment;
+ private SecondFragment mSecondFragment;
private boolean is_twoscreen = false;
- private int appListIndex = 2;
- private int defaultCurrent = 1;
+ private int appListIndex = 3;
+ private int defaultCurrent = 2;
@Override
public int getLayoutId() {
@@ -111,18 +111,18 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
mBaseFragmentPagerAdapter = new BaseFragmentPagerAdapter(mFragmentManager, mFragments);
// fragmentTransaction.add(R.id.viewPager, appListFragment);
// fragmentTransaction.commit();
-
+ mControlFragment =new ControlFragment();
+ mFragments.add(mControlFragment);
// is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 1) == 1;
// if (is_twoscreen) {
// appListIndex = 2;
// defaultCurrent = 1;
-// mSecondFragment = new SecondFragment();
-// mFragments.add(mSecondFragment);
+ mSecondFragment = new SecondFragment();
+ mFragments.add(mSecondFragment);
// }
// mCustomFragment = new CustomFragment();
// mFragments.add(mCustomFragment);
- mControlFragment =new ControlFragment();
- mFragments.add(mControlFragment);
+
mHomeFragment =new HomeFragment();
mFragments.add(mHomeFragment);
@@ -155,7 +155,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
});
mViewPager.setAdapter(mBaseFragmentPagerAdapter);
- mViewPager.setOffscreenPageLimit(2);
+ mViewPager.setOffscreenPageLimit(3);
mMagicIndicator.setNavigator(scaleCircleNavigator);
ViewPagerHelper.bind(mMagicIndicator, mViewPager);
if (mFragments.size() > 1) {
@@ -380,6 +380,8 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
Permission.WRITE_EXTERNAL_STORAGE,
Permission.READ_PHONE_STATE,
Permission.WRITE_SETTINGS,
+ Permission.READ_CALL_LOG,
+ Permission.WRITE_CALL_LOG,
};
private void getPermission() {
diff --git a/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java
index 8814537..d0b75c5 100644
--- a/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java
@@ -1,33 +1,88 @@
package com.uiuios.aios.activity.weather;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.google.gson.Gson;
import com.qweather.sdk.bean.weather.WeatherDailyBean;
+import com.tencent.mmkv.MMKV;
import com.uiuios.aios.R;
+import com.uiuios.aios.activity.location.LocationAcivity;
import com.uiuios.aios.adapter.WeatherDayApdapter;
import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.JsonBean;
+import com.uiuios.aios.bean.MapGeoResult;
+import com.uiuios.aios.config.CommonConfig;
+import com.uiuios.aios.gson.GetJsonDataUtil;
+import com.uiuios.aios.manager.RemoteManager;
+import com.uiuios.aios.utils.ToastUtil;
import com.uiuios.aios.view.HorizontalItemDecoration;
+
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.List;
+
import butterknife.BindView;
import butterknife.ButterKnife;
public class WeatherActivity extends BaseActivity implements WeatherContact.WeatherView {
+ private static final String TAG = WeatherActivity.class.getSimpleName();
+
@BindView(R.id.rv_weather)
RecyclerView rv_weather;
@BindView(R.id.tv_location)
TextView tv_location;
@BindView(R.id.iv_back)
ImageView iv_back;
+ @BindView(R.id.tv_refresh)
+ TextView tv_refresh;
private WeatherPresenter mPresenter;
private WeatherDayApdapter mWeatherDayApdapter;
+ private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
+
+ private List options1Items = new ArrayList<>();
+ private ArrayList> options2Items = new ArrayList<>();
+ private ArrayList>> options3Items = new ArrayList<>();
+ private Thread thread;
+ private static final int MSG_LOAD_DATA = 0x0001;
+ private static final int MSG_LOAD_SUCCESS = 0x0002;
+ private static final int MSG_LOAD_FAILED = 0x0003;
+ private static boolean isLoaded = false;
+
+
+ private String mProvince;
+ private String mCity;
+ private String mDistrict;
+
+ private ActivityResultLauncher register;
+
@Override
public int getLayoutId() {
@@ -40,6 +95,7 @@ public class WeatherActivity extends BaseActivity implements WeatherContact.Weat
mPresenter = new WeatherPresenter(this);
mPresenter.attachView(this);
mPresenter.setLifecycle(lifecycleSubject);
+ RemoteManager.getInstance().getLocation();
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
Resources resources = getResources();
if (resources.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -59,16 +115,120 @@ public class WeatherActivity extends BaseActivity implements WeatherContact.Weat
finish();
}
});
+ tv_refresh.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ String district = mMMKV.decodeString(CommonConfig.MANUALLY_SELECT_LOCATION_DISTRICT, "");
+ String tude = mMMKV.decodeString(CommonConfig.MANUALLY_SELECT_LOCATION_TUDE, "");
+ if (TextUtils.isEmpty(tude)) {
+ mPresenter.getLocation();
+ } else {
+ tv_location.setText(district);
+ mPresenter.getWeather(tude);
+ }
+ ToastUtil.show("刷新成功");
+ }
+ });
+ tv_location.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ hideSoftKeyBoard(v);
+ if (!isLoaded) {
+ ToastUtil.show("位置数据没有加载完成");
+ } else {
+// showPickerView();
+ register.launch(new Intent(WeatherActivity.this, LocationAcivity.class));
+ }
+ }
+ });
+ register = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() {
+ @Override
+ public void onActivityResult(ActivityResult result) {
+ Log.e(TAG, "onActivityResult: " + result);
+ if (result != null) {
+ Intent intent = result.getData();
+ if (intent != null && result.getResultCode() == Activity.RESULT_OK) {
+ Bundle bundle = intent.getExtras();
+ Log.e(TAG, "onActivityResult: " + bundle);
+ String address = bundle.getString("address");
+ mDistrict = bundle.getString("district");
+ mMMKV.encode(CommonConfig.MANUALLY_SELECT_LOCATION_ADDRESS, address);
+ mMMKV.encode(CommonConfig.MANUALLY_SELECT_LOCATION_DISTRICT, mDistrict);
+ mPresenter.decodeGeo(address);
+ tv_location.setText(mDistrict);
+ }
+ }
+ }
+ });
+ }
+
+ private void showPickerView() {// 弹出选择器
+ OptionsPickerView pvOptions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
+ @Override
+ public void onOptionsSelect(int options1, int options2, int options3, View v) {
+ //返回的分别是三个级别的选中位置
+ mProvince = options1Items.size() > 0 ?
+ options1Items.get(options1).getPickerViewText() : "";
+
+ mCity = options2Items.size() > 0
+ && options2Items.get(options1).size() > 0 ?
+ options2Items.get(options1).get(options2) : "";
+
+ mDistrict = options2Items.size() > 0
+ && options3Items.get(options1).size() > 0
+ && options3Items.get(options1).get(options2).size() > 0 ?
+ options3Items.get(options1).get(options2).get(options3) : "";
+
+ String address = mProvince + mCity + mDistrict;
+ Log.e(TAG, "onOptionsSelect: " + address);
+ tv_location.setText(mDistrict);
+ mMMKV.encode(CommonConfig.MANUALLY_SELECT_LOCATION_ADDRESS, address);
+ mMMKV.encode(CommonConfig.MANUALLY_SELECT_LOCATION_DISTRICT, mDistrict);
+ mPresenter.decodeGeo(address);
+
+ }
+ })
+
+ .setTitleText("城市选择")
+ .setDividerColor(Color.BLACK)
+ .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+ .setContentTextSize(20)
+ .setLineSpacingMultiplier(2.5f)
+ .build();
+
+// pvOptions.setPicker(options1Items);//一级选择器
+// pvOptions.setPicker(options1Items, options2Items);//二级选择器
+ pvOptions.setPicker(options1Items, options2Items, options3Items);//三级选择器
+ pvOptions.show();
}
@Override
public void initData() {
- mPresenter.getLocation();
+ mHandler.sendEmptyMessage(MSG_LOAD_DATA);
+ String district = mMMKV.decodeString(CommonConfig.MANUALLY_SELECT_LOCATION_DISTRICT, "");
+ String tude = mMMKV.decodeString(CommonConfig.MANUALLY_SELECT_LOCATION_TUDE, "");
+ if (TextUtils.isEmpty(tude)) {
+ mPresenter.getLocation();
+ } else {
+ tv_location.setText(district);
+ mPresenter.getWeather(tude);
+ }
+ }
+
+ @Override
+ public void setGeo(MapGeoResult mapGeoresult) {
+ if (mapGeoresult != null) {
+ mMMKV.encode(CommonConfig.MANUALLY_SELECT_LOCATION_TUDE, mapGeoresult.getLocation().toString());
+ mPresenter.getWeather(mapGeoresult.getLocation().toString());
+ } else {
+ ToastUtil.show("获取位置信息失败");
+ }
}
@Override
public void setLocation(String location) {
tv_location.setText(location);
+ ToastUtil.show("刷新成功");
mPresenter.getWeatherCache();
}
@@ -77,8 +237,7 @@ public class WeatherActivity extends BaseActivity implements WeatherContact.Weat
if (weatherCache != null) {
mWeatherDayApdapter.setDailyBeans(weatherCache.getDaily());
}
- mPresenter.getWeather();
-
+ mPresenter.getWeather(RemoteManager.getInstance().getLocationTude());
}
@Override
@@ -103,4 +262,113 @@ public class WeatherActivity extends BaseActivity implements WeatherContact.Weat
super.onDestroy();
mPresenter.detachView();
}
+
+ private void hideSoftKeyBoard(View view) {
+ if (view != null) {
+ InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+ }
+
+ @SuppressLint("HandlerLeak")
+ private Handler mHandler = new Handler() {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_LOAD_DATA:
+ if (thread == null) {//如果已创建就不再重新创建子线程了
+ Log.e(TAG, "handleMessage: Begin Parse Data");
+ thread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ // 子线程中解析省市区数据
+ initJsonData();
+ }
+ });
+ thread.start();
+ }
+ break;
+
+ case MSG_LOAD_SUCCESS:
+ Log.e(TAG, "handleMessage: Parse Succeed");
+ isLoaded = true;
+ break;
+
+ case MSG_LOAD_FAILED:
+ Log.e(TAG, "handleMessage: Parse Failed");
+ break;
+ default:
+ }
+ }
+ };
+
+
+ private void initJsonData() {//解析数据
+
+ /**
+ * 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
+ * 关键逻辑在于循环体
+ *
+ * */
+ String JsonData = new GetJsonDataUtil().getJson(this, "province.json");//获取assets目录下的json文件数据
+
+ ArrayList jsonBean = parseData(JsonData);//用Gson 转成实体
+
+ /**
+ * 添加省份数据
+ *
+ * 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
+ * PickerView会通过getPickerViewText方法获取字符串显示出来。
+ */
+ options1Items = jsonBean;
+
+ for (int i = 0; i < jsonBean.size(); i++) {//遍历省份
+ ArrayList cityList = new ArrayList<>();//该省的城市列表（第二级）
+ ArrayList> province_AreaList = new ArrayList<>();//该省的所有地区列表（第三极）
+
+ for (int c = 0; c < jsonBean.get(i).getCityList().size(); c++) {//遍历该省份的所有城市
+ String cityName = jsonBean.get(i).getCityList().get(c).getName();
+ cityList.add(cityName);//添加城市
+ ArrayList city_AreaList = new ArrayList<>();//该城市的所有地区列表
+
+ //如果无地区数据，建议添加空字符串，防止数据为null 导致三个选项长度不匹配造成崩溃
+ /*if (jsonBean.get(i).getCityList().get(c).getArea() == null
+ || jsonBean.get(i).getCityList().get(c).getArea().size() == 0) {
+ city_AreaList.add("");
+ } else {
+ city_AreaList.addAll(jsonBean.get(i).getCityList().get(c).getArea());
+ }*/
+ city_AreaList.addAll(jsonBean.get(i).getCityList().get(c).getArea());
+ province_AreaList.add(city_AreaList);//添加该省所有地区数据
+ }
+
+ /**
+ * 添加城市数据
+ */
+ options2Items.add(cityList);
+
+ /**
+ * 添加地区数据
+ */
+ options3Items.add(province_AreaList);
+ }
+
+ mHandler.sendEmptyMessage(MSG_LOAD_SUCCESS);
+ }
+
+ public ArrayList parseData(String result) {//Gson 解析
+ ArrayList detail = new ArrayList<>();
+ try {
+ JSONArray data = new JSONArray(result);
+ Gson gson = new Gson();
+ for (int i = 0; i < data.length(); i++) {
+ JsonBean entity = gson.fromJson(data.optJSONObject(i).toString(), JsonBean.class);
+ detail.add(entity);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ mHandler.sendEmptyMessage(MSG_LOAD_FAILED);
+ }
+ return detail;
+ }
}
diff --git a/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java
index 3fbbf69..4f53f4d 100644
--- a/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java
@@ -3,24 +3,26 @@ package com.uiuios.aios.activity.weather;
import com.qweather.sdk.bean.weather.WeatherDailyBean;
import com.uiuios.aios.base.BasePresenter;
import com.uiuios.aios.base.BaseView;
+import com.uiuios.aios.bean.MapGeoResult;
public class WeatherContact {
public interface Presenter extends BasePresenter {
+ void decodeGeo(String address);
//获取定位缓存
void getLocation();
//获取天气缓存
void getWeatherCache();
//获取天气
- void getWeather();
+ void getWeather(String locationTude);
}
public interface WeatherView extends BaseView {
+ void setGeo(MapGeoResult mapGeoresult);
//设置定位缓存
void setLocation(String location);
//设置天气缓存
void setWeatherCache(WeatherDailyBean weatherCache);
//设置天气
void setWeather(WeatherDailyBean weather);
-
}
}
diff --git a/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java
index 3e6e1ba..ab0c0e4 100644
--- a/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java
@@ -3,19 +3,23 @@ package com.uiuios.aios.activity.weather;
import android.content.Context;
import android.util.Log;
-import androidx.annotation.NonNull;
-
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.qweather.sdk.bean.weather.WeatherDailyBean;
import com.qweather.sdk.view.QWeather;
import com.tencent.mmkv.MMKV;
+import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.bean.MapGeoBean;
import com.uiuios.aios.config.CommonConfig;
import com.uiuios.aios.manager.RemoteManager;
+import com.uiuios.aios.network.NetInterfaceManager;
import java.lang.reflect.Type;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.subjects.BehaviorSubject;
/**
@@ -40,7 +44,7 @@ public class WeatherPresenter implements WeatherContact.Presenter {
return lifecycle;
}
- public WeatherPresenter(Context context) {
+ WeatherPresenter(Context context) {
this.mContext = context;
Log.e(TAG, "WeatherPresenter: " + context.getClass());
}
@@ -56,9 +60,45 @@ public class WeatherPresenter implements WeatherContact.Presenter {
}
+ @Override
+ public void decodeGeo(String address) {
+ Log.e(TAG, "decodeGeo: " + address);
+ NetInterfaceManager.getInstance().getGeoObservable(address)
+ .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("decodeGeo", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(@NonNull MapGeoBean mapGeoBean) {
+ Log.e("decodeGeo", "onNext: " + mapGeoBean);
+ if (mapGeoBean.getStatus() == 0) {
+ mView.setGeo(mapGeoBean.getResult());
+ } else {
+ mView.setGeo(null);
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("decodeGeo", "onError: " + e.getMessage());
+ mView.setGeo(null);
+ onComplete();
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("decodeGeo", "onComplete: ");
+ }
+ });
+
+ }
+
@Override
public void getLocation() {
- String location = RemoteManager.getInstance().getCityDistrict();
+ String location = RemoteManager.getInstance().getDistrict();
mView.setLocation(location);
}
@@ -73,8 +113,8 @@ public class WeatherPresenter implements WeatherContact.Presenter {
}
@Override
- public void getWeather() {
- QWeather.getWeather7D(mContext, RemoteManager.getInstance().getLocationTude(), new QWeather.OnResultWeatherDailyListener() {
+ public void getWeather(String locationTude) {
+ QWeather.getWeather7D(mContext, locationTude, new QWeather.OnResultWeatherDailyListener() {
@Override
public void onError(Throwable throwable) {
Log.e("getWeather", "onError: " + throwable.getMessage());
diff --git a/app/src/main/java/com/uiuios/aios/adapter/CityAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/CityAdapter.java
new file mode 100644
index 0000000..3e8b7cf
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/CityAdapter.java
@@ -0,0 +1,77 @@
+package com.uiuios.aios.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.AddressBean;
+
+import java.util.List;
+
+public class CityAdapter extends RecyclerView.Adapter {
+
+ private List mCityList;
+ private Context mContext;
+
+ public void setCityList(List cityList) {
+ mCityList = cityList;
+ notifyDataSetChanged();
+ }
+
+ public interface CityCallback {
+ void onCitySelected(AddressBean addressBean);
+ }
+
+ private CityCallback mCityCallback;
+
+ public void setCityCallback(CityCallback cityCallback) {
+ mCityCallback = cityCallback;
+ }
+
+ @NonNull
+ @Override
+ public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new Holder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_city, parent, false));
+ }
+
+
+ @Override
+ public void onBindViewHolder(@NonNull Holder holder, int position) {
+ AddressBean addressBean = mCityList.get(position);
+ String city = addressBean.toString();
+ holder.tv_city.setText(city);
+ holder.root.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if (mCityCallback != null) {
+ mCityCallback.onCitySelected(addressBean);
+ }
+ }
+ });
+ }
+
+
+ @Override
+ public int getItemCount() {
+ return mCityList == null ? 0 : mCityList.size();
+ }
+
+ class Holder extends RecyclerView.ViewHolder {
+ ConstraintLayout root;
+ TextView tv_city;
+
+ public Holder(@NonNull View itemView) {
+ super(itemView);
+ root = itemView.findViewById(R.id.root);
+ tv_city = itemView.findViewById(R.id.tv_city);
+ }
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/DistrictAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/DistrictAdapter.java
new file mode 100644
index 0000000..8e6558b
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/DistrictAdapter.java
@@ -0,0 +1,77 @@
+package com.uiuios.aios.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.AddressBean;
+
+import java.util.List;
+
+public class DistrictAdapter extends RecyclerView.Adapter {
+
+ private List mDistrict;
+ private Context mContext;
+
+ public void setDistrict(List district) {
+ mDistrict = district;
+ notifyDataSetChanged();
+ }
+
+ public interface DistrictCallback {
+ void onDistrictSelected(AddressBean district);
+ }
+
+ private DistrictCallback mDistrictCallback;
+
+ public void setDistrictCallback(DistrictCallback districtCallback) {
+ mDistrictCallback = districtCallback;
+ }
+
+ @NonNull
+ @Override
+ public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new Holder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_district, parent, false));
+ }
+
+
+ @Override
+ public void onBindViewHolder(@NonNull Holder holder, int position) {
+ AddressBean addressBean = mDistrict.get(position);
+ String city = addressBean.toString();
+ holder.tv_district.setText(city);
+ holder.root.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if (mDistrictCallback != null) {
+ mDistrictCallback.onDistrictSelected(addressBean);
+ }
+ }
+ });
+ }
+
+
+ @Override
+ public int getItemCount() {
+ return mDistrict == null ? 0 : mDistrict.size();
+ }
+
+ class Holder extends RecyclerView.ViewHolder {
+ ConstraintLayout root;
+ TextView tv_district;
+
+ public Holder(@NonNull View itemView) {
+ super(itemView);
+ root = itemView.findViewById(R.id.root);
+ tv_district = itemView.findViewById(R.id.tv_district);
+ }
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/InformationAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/InformationAdapter.java
new file mode 100644
index 0000000..76c315d
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/InformationAdapter.java
@@ -0,0 +1,75 @@
+package com.uiuios.aios.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.shehuan.niv.NiceImageView;
+import com.uiuios.aios.R;
+import com.uiuios.aios.activity.InformationDetailsActivity;
+import com.uiuios.aios.bean.ArticleInfo;
+import com.uiuios.aios.utils.GlideLoadUtils;
+import com.uiuios.aios.utils.TimeUtils;
+
+import java.util.List;
+
+public class InformationAdapter extends RecyclerView.Adapter {
+
+ private Context mContext;
+ private List mArticleInfos;
+
+ public void setArticleInfos(List articleInfos) {
+ mArticleInfos = articleInfos;
+ notifyDataSetChanged();
+ }
+
+ @Override
+ public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new InformationAdapter.Holder(LayoutInflater.from(mContext).inflate(R.layout.item_information, parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull Holder holder, int position) {
+ ArticleInfo articleInfo = mArticleInfos.get(position);
+ holder.tv_consult_title.setText(articleInfo.getTitle());
+ GlideLoadUtils.getInstance().glideLoad(mContext, articleInfo.getImg(), holder.nv_consult);
+ holder.tv_time.setText(TimeUtils.transferSecondgToDate(articleInfo.getUpdate_time()));
+ holder.root.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(mContext, InformationDetailsActivity.class);
+ intent.putExtra("articleInfo", articleInfo);
+ mContext.startActivity(intent);
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return mArticleInfos == null ? 0 : mArticleInfos.size();
+ }
+
+ class Holder extends RecyclerView.ViewHolder {
+ ConstraintLayout root;
+ NiceImageView nv_consult;
+ TextView tv_consult_title;
+ TextView tv_time;
+
+ public Holder(@NonNull View itemView) {
+ super(itemView);
+ root = itemView.findViewById(R.id.root);
+ nv_consult = itemView.findViewById(R.id.nv_consult);
+ tv_consult_title = itemView.findViewById(R.id.tv_consult_title);
+ tv_time = itemView.findViewById(R.id.tv_time);
+ }
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/KnowledgeVideoAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/KnowledgeVideoAdapter.java
new file mode 100644
index 0000000..28ae1a4
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/KnowledgeVideoAdapter.java
@@ -0,0 +1,81 @@
+package com.uiuios.aios.adapter;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.shehuan.niv.NiceImageView;
+import com.uiui.video.bean.VideoInfo;
+import com.uiuios.aios.R;
+
+import java.util.ArrayList;
+
+public class KnowledgeVideoAdapter extends RecyclerView.Adapter {
+ private static final String TAG = KnowledgeVideoAdapter.class.getSimpleName();
+
+ private Context mContext;
+ private ArrayList mKnowledgeVideoList;
+
+ public void setLivenVideoList(ArrayList livenVideoList) {
+ mKnowledgeVideoList = livenVideoList;
+ notifyDataSetChanged();
+ }
+
+ @NonNull
+ @Override
+ public LivenVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new KnowledgeVideoAdapter.LivenVideoHolder(LayoutInflater.from(mContext).inflate(R.layout.item_knowledge_video, parent, false));
+ }
+
+
+ @Override
+ public void onBindViewHolder(@NonNull LivenVideoHolder holder, int position) {
+ VideoInfo videoInfo = mKnowledgeVideoList.get(position);
+ Glide.with(holder.nv_cover).load(videoInfo.getVideo_cover()).into(holder.nv_cover);
+ holder.tv_title.setText(videoInfo.getName());
+ holder.nv_cover.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.setComponent(new ComponentName("com.uiui.video", "com.uiui.video.activity.TikTokActivity"));
+ intent.putExtra("position", position);
+ intent.putParcelableArrayListExtra("list", mKnowledgeVideoList);
+ try {
+ mContext.startActivity(intent);
+ } catch (Exception e) {
+ Log.e(TAG, "onClick: " + e.getMessage());
+ }
+ }
+ });
+ }
+
+
+ @Override
+ public int getItemCount() {
+ return mKnowledgeVideoList == null ? 0 : mKnowledgeVideoList.size();
+ }
+
+ class LivenVideoHolder extends RecyclerView.ViewHolder {
+
+ NiceImageView nv_cover;
+ TextView tv_title;
+
+ public LivenVideoHolder(@NonNull View itemView) {
+ super(itemView);
+ nv_cover = itemView.findViewById(R.id.nv_cover);
+ tv_title = itemView.findViewById(R.id.tv_title);
+ }
+ }
+
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/LivenVideoAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/LivenVideoAdapter.java
new file mode 100644
index 0000000..f24c20a
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/LivenVideoAdapter.java
@@ -0,0 +1,77 @@
+package com.uiuios.aios.adapter;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.shehuan.niv.NiceImageView;
+import com.uiui.video.bean.VideoInfo;
+import com.uiuios.aios.R;
+
+import java.util.ArrayList;
+
+public class LivenVideoAdapter extends RecyclerView.Adapter {
+ private static final String TAG = LivenVideoAdapter.class.getSimpleName();
+
+ private Context mContext;
+ private ArrayList mLivenVideoList;
+
+ public void setLivenVideoList(ArrayList livenVideoList) {
+ mLivenVideoList = livenVideoList;
+ notifyDataSetChanged();
+ }
+
+ @NonNull
+ @Override
+ public LivenVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new LivenVideoAdapter.LivenVideoHolder(LayoutInflater.from(mContext).inflate(R.layout.item_liven_video, parent, false));
+ }
+
+
+ @Override
+ public void onBindViewHolder(@NonNull LivenVideoHolder holder, int position) {
+ VideoInfo videoInfo = mLivenVideoList.get(position);
+ Glide.with(holder.iv_cover).load(videoInfo.getVideo_cover()).into(holder.iv_cover);
+ holder.iv_cover.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.setComponent(new ComponentName("com.uiui.video", "com.uiui.video.activity.TikTokActivity"));
+ intent.putExtra("position", position);
+ intent.putParcelableArrayListExtra("list", mLivenVideoList);
+ try {
+ mContext.startActivity(intent);
+ } catch (Exception e) {
+ Log.e(TAG, "onClick: " + e.getMessage());
+ }
+ }
+ });
+ }
+
+
+ @Override
+ public int getItemCount() {
+ return mLivenVideoList == null ? 0 : mLivenVideoList.size();
+ }
+
+ class LivenVideoHolder extends RecyclerView.ViewHolder {
+
+ NiceImageView iv_cover;
+
+ public LivenVideoHolder(@NonNull View itemView) {
+ super(itemView);
+ iv_cover = itemView.findViewById(R.id.iv_cover);
+ }
+ }
+
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/NewArticleAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/NewArticleAdapter.java
new file mode 100644
index 0000000..6ef0e9f
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/NewArticleAdapter.java
@@ -0,0 +1,71 @@
+package com.uiuios.aios.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.shehuan.niv.NiceImageView;
+import com.uiuios.aios.R;
+import com.uiuios.aios.activity.ArticleActivity;
+import com.uiuios.aios.activity.InformationActivity;
+import com.uiuios.aios.bean.ArticleInfo;
+
+import java.util.List;
+
+public class NewArticleAdapter extends RecyclerView.Adapter {
+
+ private Context mContext;
+ private List mArticleBeanList;
+
+ public void setArticleBeanList(List list) {
+ this.mArticleBeanList = list;
+ notifyDataSetChanged();
+ }
+
+ @NonNull
+ @Override
+ public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new NewArticleAdapter.Holder(LayoutInflater.from(mContext).inflate(R.layout.item_new_article, parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull Holder holder, int position) {
+ ArticleInfo articleInfo = mArticleBeanList.get(position);
+ Glide.with(holder.nv_consult).load(articleInfo.getImg()).into(holder.nv_consult);
+ holder.tv_consult_title.setText(articleInfo.getTitle());
+ holder.root.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(mContext, InformationActivity.class);
+ mContext.startActivity(intent);
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return mArticleBeanList == null ? 0 : mArticleBeanList.size();
+ }
+
+ class Holder extends RecyclerView.ViewHolder {
+ ConstraintLayout root;
+ NiceImageView nv_consult;
+ TextView tv_consult_title;
+
+ public Holder(@NonNull View itemView) {
+ super(itemView);
+ root = itemView.findViewById(R.id.root);
+ nv_consult = itemView.findViewById(R.id.nv_consult);
+ tv_consult_title = itemView.findViewById(R.id.tv_consult_title);
+ }
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/NewGoodsAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/NewGoodsAdapter.java
new file mode 100644
index 0000000..45cc892
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/NewGoodsAdapter.java
@@ -0,0 +1,68 @@
+package com.uiuios.aios.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.shehuan.niv.NiceImageView;
+import com.uiuios.aios.R;
+import com.uiuios.aios.activity.DetailsActivity;
+import com.uiuios.aios.bean.GoodsInfo;
+
+import java.util.List;
+
+public class NewGoodsAdapter extends RecyclerView.Adapter {
+
+ private Context mContext;
+ private List goodsInfoList;
+
+ public void setGoodsInfoList(List list) {
+ this.goodsInfoList = list;
+ notifyDataSetChanged();
+ }
+
+ @NonNull
+ @Override
+ public GoodsHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new NewGoodsAdapter.GoodsHolder(LayoutInflater.from(mContext).inflate(R.layout.item_new_goods, parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull GoodsHolder holder, int position) {
+ GoodsInfo goodsInfo = goodsInfoList.get(position);
+ Glide.with(holder.nv_goods_pic).load(goodsInfo.getImg()).error(mContext.getResources().getDrawable(R.drawable.nodata)).into(holder.nv_goods_pic);
+ holder.tv_goods_title.setText(goodsInfo.getGoods_desc());
+ holder.tv_goods_pirce.setText("热卖促销￥" + goodsInfo.getBuying_price());
+ }
+
+ @Override
+ public int getItemCount() {
+ return goodsInfoList == null ? 0 : goodsInfoList.size();
+ }
+
+ static class GoodsHolder extends RecyclerView.ViewHolder {
+ NiceImageView nv_goods_pic;
+ TextView tv_goods_title;
+ TextView tv_goods_pirce;
+ TextView tv_buy;
+
+ public GoodsHolder(@NonNull View itemView) {
+ super(itemView);
+ nv_goods_pic = itemView.findViewById(R.id.nv_goods_pic);
+ tv_goods_title = itemView.findViewById(R.id.tv_goods_title);
+ tv_goods_pirce = itemView.findViewById(R.id.tv_goods_pirce);
+ tv_buy = itemView.findViewById(R.id.tv_buy);
+ }
+ }
+
+}
diff --git a/app/src/main/java/com/uiuios/aios/adapter/TitleAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/TitleAdapter.java
new file mode 100644
index 0000000..544592c
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/adapter/TitleAdapter.java
@@ -0,0 +1,91 @@
+package com.uiuios.aios.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.CategoryBean;
+
+import java.util.List;
+
+public class TitleAdapter extends RecyclerView.Adapter {
+
+ private Context mContext;
+
+ private List mCategoryList;
+ private String mTitle = "";
+
+ public void setCategoryList(List categoryList) {
+ mCategoryList = categoryList;
+ notifyDataSetChanged();
+ }
+
+ public String getTitle() {
+ return mTitle;
+ }
+
+ public interface TitleChangeCallback {
+ void onTitleChange(CategoryBean categoryBean);
+ }
+
+ private TitleChangeCallback mTitleChangeCallback;
+
+ public void setTitleChangeCallback(TitleChangeCallback titleChangeCallback) {
+ mTitleChangeCallback = titleChangeCallback;
+ }
+
+ @NonNull
+ @Override
+ public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ mContext = parent.getContext();
+ return new Holder(LayoutInflater.from(mContext).inflate(R.layout.item_title, parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull Holder holder, int position) {
+ CategoryBean videoCategory = mCategoryList.get(position);
+ String title = videoCategory.getName();
+ holder.tv_title.setText(title);
+ if (mTitle.equals(title)) {
+ holder.tv_title.setBackground(mContext.getDrawable(R.drawable.title_select_background));
+ holder.tv_title.setTextColor(mContext.getColor(R.color.black));
+ } else {
+ holder.tv_title.setBackground(mContext.getDrawable(R.drawable.title_background));
+ holder.tv_title.setTextColor(mContext.getColor(R.color.white));
+ }
+ holder.tv_title.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mTitle = title;
+ notifyDataSetChanged();
+ if (mTitleChangeCallback != null) {
+ mTitleChangeCallback.onTitleChange(videoCategory);
+ }
+ }
+ });
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return mCategoryList == null ? 0 : mCategoryList.size();
+ }
+
+ class Holder extends RecyclerView.ViewHolder {
+
+ TextView tv_title;
+
+ public Holder(@NonNull View itemView) {
+ super(itemView);
+ tv_title = itemView.findViewById(R.id.tv_title);
+
+ }
+
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/alarm/AlarmAdapter.java b/app/src/main/java/com/uiuios/aios/alarm/AlarmAdapter.java
index a7bbc89..7b9c97c 100644
--- a/app/src/main/java/com/uiuios/aios/alarm/AlarmAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/alarm/AlarmAdapter.java
@@ -21,7 +21,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.uiuios.aios.R;
-import com.uiuios.aios.activity.alarm.AlarmClockEditActivity;
+import com.uiuios.aios.activity.alarmclock.AlarmClockEditActivity;
import com.uiuios.aios.utils.FFmpegUtils;
import com.uiuios.aios.utils.ScreenUtils;
import com.uiuios.aios.utils.Utils;
diff --git a/app/src/main/java/com/uiuios/aios/alarm/AlarmClockData.java b/app/src/main/java/com/uiuios/aios/alarm/AlarmClockData.java
index de26715..258eedc 100644
--- a/app/src/main/java/com/uiuios/aios/alarm/AlarmClockData.java
+++ b/app/src/main/java/com/uiuios/aios/alarm/AlarmClockData.java
@@ -8,6 +8,7 @@ import androidx.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.JsonParser;
+import com.google.gson.annotations.SerializedName;
import java.io.Serializable;
import java.text.ParseException;
@@ -29,6 +30,8 @@ public class AlarmClockData implements Serializable {
String file_md5;
int remind_type;
int is_onoff;//0关闭 1开启
+ @SerializedName("class")
+ int clazz;
boolean finished = false;
boolean is_local = false;
@@ -123,6 +126,14 @@ public class AlarmClockData implements Serializable {
this.is_onoff = is_onoff;
}
+ public int getClazz() {
+ return clazz;
+ }
+
+ public void setClazz(int clazz) {
+ this.clazz = clazz;
+ }
+
public boolean isIs_local() {
return is_local;
}
diff --git a/app/src/main/java/com/uiuios/aios/base/BaseDataBindingActivity.java b/app/src/main/java/com/uiuios/aios/base/BaseDataBindingActivity.java
new file mode 100644
index 0000000..5f88113
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/base/BaseDataBindingActivity.java
@@ -0,0 +1,123 @@
+package com.uiuios.aios.base;
+
+import android.os.Bundle;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.CheckResult;
+import androidx.annotation.ContentView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.trello.rxlifecycle4.LifecycleProvider;
+import com.trello.rxlifecycle4.LifecycleTransformer;
+import com.trello.rxlifecycle4.RxLifecycle;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
+import com.uiuios.aios.R;
+import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
+public abstract class BaseDataBindingActivity extends AppCompatActivity implements LifecycleProvider {
+ public final BehaviorSubject lifecycleSubject = BehaviorSubject.create();
+
+ public BaseDataBindingActivity() {
+ super();
+ }
+
+ @ContentView
+ public BaseDataBindingActivity(@LayoutRes int contentLayoutId) {
+ super(contentLayoutId);
+ }
+
+ @Override
+ @NonNull
+ @CheckResult
+ public final Observable lifecycle() {
+ return lifecycleSubject.hide();
+ }
+
+ @Override
+ @NonNull
+ @CheckResult
+ public final LifecycleTransformer bindUntilEvent(@NonNull ActivityEvent event) {
+ return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
+ }
+
+ @Override
+ @NonNull
+ @CheckResult
+ public final LifecycleTransformer bindToLifecycle() {
+ return RxLifecycleAndroid.bindActivity(lifecycleSubject);
+ }
+
+ @Override
+ @CallSuper
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ lifecycleSubject.onNext(ActivityEvent.CREATE);
+// StatusBarUtil.init(this);
+ UltimateBarX.statusBar(this)
+ .transparent()
+ .colorRes(R.color.colorPrimaryDark)
+ .light(true)
+ .apply();
+ UltimateBarX.navigationBar(this)
+ .transparent()
+ .colorRes(R.color.colorPrimaryDark)
+ .light(true)
+ .apply();
+ initView();
+ initData();
+ }
+
+
+ /**
+ * 初始化视图
+ */
+ public abstract void initView();
+
+
+ /**
+ * 初始化数据
+ */
+ public abstract void initData();
+
+ @Override
+ @CallSuper
+ protected void onStart() {
+ super.onStart();
+ lifecycleSubject.onNext(ActivityEvent.START);
+ }
+
+ @Override
+ @CallSuper
+ protected void onResume() {
+ super.onResume();
+ lifecycleSubject.onNext(ActivityEvent.RESUME);
+ }
+
+ @Override
+ @CallSuper
+ protected void onPause() {
+ lifecycleSubject.onNext(ActivityEvent.PAUSE);
+ super.onPause();
+ }
+
+ @Override
+ @CallSuper
+ protected void onStop() {
+ lifecycleSubject.onNext(ActivityEvent.STOP);
+ super.onStop();
+ }
+
+ @Override
+ @CallSuper
+ protected void onDestroy() {
+ lifecycleSubject.onNext(ActivityEvent.DESTROY);
+ super.onDestroy();
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/base/BaseFragment.java b/app/src/main/java/com/uiuios/aios/base/BaseFragment.java
index 502b33f..d7a30f9 100644
--- a/app/src/main/java/com/uiuios/aios/base/BaseFragment.java
+++ b/app/src/main/java/com/uiuios/aios/base/BaseFragment.java
@@ -83,7 +83,7 @@ public abstract class BaseFragment extends Fragment implements LifecycleProvider
public boolean prepareFetchData(boolean forceUpdate) {
if (isVisibleToUser && isViewInitiated && (!isDataInitiated || forceUpdate)) {
fetchData();
- isDataInitiated = true;
+// isDataInitiated = true;
return true;
}
return false;
diff --git a/app/src/main/java/com/uiuios/aios/bean/AddressBean.java b/app/src/main/java/com/uiuios/aios/bean/AddressBean.java
new file mode 100644
index 0000000..99e9bea
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/bean/AddressBean.java
@@ -0,0 +1,63 @@
+package com.uiuios.aios.bean;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+
+public class AddressBean implements Serializable {
+ private static final long serialVersionUID = 5408415869212907187L;
+
+ private String mProvince;
+ private String mCity;
+ private String mDistrict;
+
+ public AddressBean(String province, String city, String district) {
+ mProvince = province;
+ mCity = city;
+ mDistrict = district;
+ }
+
+
+ public AddressBean(String district) {
+ mDistrict = district;
+ }
+
+ public String getProvince() {
+ return mProvince;
+ }
+
+ public void setProvince(String province) {
+ mProvince = province;
+ }
+
+ public String getCity() {
+ return mCity;
+ }
+
+ public void setCity(String city) {
+ mCity = city;
+ }
+
+ public String getDistrict() {
+ return mDistrict;
+ }
+
+ public void setDistrict(String district) {
+ mDistrict = district;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ String s = "";
+ if (!TextUtils.isEmpty(mProvince))
+ s += mProvince;
+ if (!TextUtils.isEmpty(mCity))
+ s += mCity;
+ if (!TextUtils.isEmpty(mDistrict))
+ s += mDistrict;
+ return s;
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java b/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java
index 82d0efa..d157cf8 100644
--- a/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java
+++ b/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java
@@ -15,6 +15,11 @@ public class ArticleInfo implements Serializable {
/*跳转链接*/
String jump_url;
+ int weight;
+ int click_count;
+ String third_url;
+ long update_time;
+
public int getId() {
return id;
}
@@ -54,4 +59,36 @@ public class ArticleInfo implements Serializable {
public void setJump_url(String jump_url) {
this.jump_url = jump_url;
}
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public void setWeight(int weight) {
+ this.weight = weight;
+ }
+
+ public int getClick_count() {
+ return click_count;
+ }
+
+ public void setClick_count(int click_count) {
+ this.click_count = click_count;
+ }
+
+ public String getThird_url() {
+ return third_url;
+ }
+
+ public void setThird_url(String third_url) {
+ this.third_url = third_url;
+ }
+
+ public long getUpdate_time() {
+ return update_time;
+ }
+
+ public void setUpdate_time(long update_time) {
+ this.update_time = update_time;
+ }
}
diff --git a/app/src/main/java/com/uiuios/aios/bean/CategoryBean.java b/app/src/main/java/com/uiuios/aios/bean/CategoryBean.java
new file mode 100644
index 0000000..85d2329
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/bean/CategoryBean.java
@@ -0,0 +1,26 @@
+package com.uiuios.aios.bean;
+
+import java.io.Serializable;
+
+public class CategoryBean implements Serializable {
+ private static final long serialVersionUID = -1254376015727204975L;
+
+ int id;
+ String name;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/bean/JsonBean.java b/app/src/main/java/com/uiuios/aios/bean/JsonBean.java
new file mode 100644
index 0000000..eda2b02
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/bean/JsonBean.java
@@ -0,0 +1,76 @@
+package com.uiuios.aios.bean;
+
+
+import com.contrarywind.interfaces.IPickerViewData;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author: 小嵩
+ * @date: 2017/3/16 15:36
+ */
+
+public class JsonBean implements IPickerViewData {
+
+
+ /**
+ * name : 省份
+ * city : [{"name":"北京市","area":["东城区","西城区","崇文区","宣武区","朝阳区"]}]
+ */
+
+ private String name;
+ private List city;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List getCityList() {
+ return city;
+ }
+
+ public void setCityList(List city) {
+ this.city = city;
+ }
+
+ // 实现 IPickerViewData 接口，
+ // 这个用来显示在PickerView上面的字符串，
+ // PickerView会通过IPickerViewData获取getPickerViewText方法显示出来。
+ @Override
+ public String getPickerViewText() {
+ return this.name;
+ }
+
+
+ public static class CityBean {
+ /**
+ * name : 城市
+ * area : ["东城区","西城区","崇文区","昌平区"]
+ */
+
+ private String name;
+ private List area;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List getArea() {
+ return area;
+ }
+
+ public void setArea(List area) {
+ this.area = area;
+ }
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/bean/MapGeoBean.java b/app/src/main/java/com/uiuios/aios/bean/MapGeoBean.java
new file mode 100644
index 0000000..4fca8e3
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/bean/MapGeoBean.java
@@ -0,0 +1,37 @@
+package com.uiuios.aios.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class MapGeoBean implements Serializable {
+ private static final long serialVersionUID = 3502542257994267517L;
+
+ int status;
+ MapGeoResult result;
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public MapGeoResult getResult() {
+ return result;
+ }
+
+ public void setResult(MapGeoResult result) {
+ this.result = result;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/bean/MapGeoLocation.java b/app/src/main/java/com/uiuios/aios/bean/MapGeoLocation.java
new file mode 100644
index 0000000..de84acf
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/bean/MapGeoLocation.java
@@ -0,0 +1,34 @@
+package com.uiuios.aios.bean;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+
+public class MapGeoLocation implements Serializable {
+ private static final long serialVersionUID = -1877191050083863647L;
+
+ String lng;
+ String lat;
+
+ public String getLng() {
+ return lng;
+ }
+
+ public void setLng(String lng) {
+ this.lng = lng;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return lng + "," + lat;
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/bean/MapGeoResult.java b/app/src/main/java/com/uiuios/aios/bean/MapGeoResult.java
new file mode 100644
index 0000000..e62bdb2
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/bean/MapGeoResult.java
@@ -0,0 +1,64 @@
+package com.uiuios.aios.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class MapGeoResult implements Serializable {
+ private static final long serialVersionUID = 2065809223607379059L;
+
+ MapGeoLocation location;
+ int precise;
+ int confidence;
+ int comprehension;
+ String level;
+
+ public MapGeoLocation getLocation() {
+ return location;
+ }
+
+ public void setLocation(MapGeoLocation location) {
+ this.location = location;
+ }
+
+ public int getPrecise() {
+ return precise;
+ }
+
+ public void setPrecise(int precise) {
+ this.precise = precise;
+ }
+
+ public int getConfidence() {
+ return confidence;
+ }
+
+ public void setConfidence(int confidence) {
+ this.confidence = confidence;
+ }
+
+ public int getComprehension() {
+ return comprehension;
+ }
+
+ public void setComprehension(int comprehension) {
+ this.comprehension = comprehension;
+ }
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+ }
+}
diff --git a/app/src/main/java/com/uiuios/aios/config/CommonConfig.java b/app/src/main/java/com/uiuios/aios/config/CommonConfig.java
index ee8b6cb..03aead2 100644
--- a/app/src/main/java/com/uiuios/aios/config/CommonConfig.java
+++ b/app/src/main/java/com/uiuios/aios/config/CommonConfig.java
@@ -22,4 +22,14 @@ public class CommonConfig {
public static final String UIUI_EXPIRE_TIME_KEY = "aios_uiui_expire_time";
public static final String SETTING_OTHER_APPINSTALLER_KEY = "setting_other_appInstaller";
+
+ public static final String VIDEO_INFO_BUNDLE = "video_bundle_info";
+
+ /*手动选择位置地址*/
+ public static final String MANUALLY_SELECT_LOCATION_ADDRESS = "map_manually_select_location";
+ /*手动选择位置 区*/
+ public static final String MANUALLY_SELECT_LOCATION_DISTRICT = "map_manually_select_district";
+ /*手动选择位置 经纬度*/
+ public static final String MANUALLY_SELECT_LOCATION_TUDE = "map_manually_select_tude";
+
}
diff --git a/app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java b/app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
index c784d05..2a48234 100644
--- a/app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
@@ -175,7 +175,7 @@ public class AppListFragment extends BaseFragment {
desktopIcon.setIcon(mContext.getResources().getDrawable(resID));
}
} else {
- iv.setImageBitmap(BitmapUtils.getIconBitmap(rootView.getContext(), desktopIcon.getIcon()));
+ iv.setImageDrawable( desktopIcon.getIcon());
}
tv.setText(desktopIcon.getLable());
// linearLayout.setEnabled(true);
@@ -323,7 +323,8 @@ public class AppListFragment extends BaseFragment {
dailyAppDialog.setOnClickBottomListener(new DailyAppDialog.OnClickBottomListener() {
@Override
public void onPositiveClick() {
- updateAppDisableStatus(pkg, label);
+// updateAppDisableStatus(pkg, label);
+ AppStatusManager.getInstance().addHidedApp(pkg);
dailyAppDialog.dismiss();
}
diff --git a/app/src/main/java/com/uiuios/aios/fragment/custom/CustomFragment.java b/app/src/main/java/com/uiuios/aios/fragment/custom/CustomFragment.java
index 271ceaf..9f431f2 100644
--- a/app/src/main/java/com/uiuios/aios/fragment/custom/CustomFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/custom/CustomFragment.java
@@ -1,7 +1,6 @@
package com.uiuios.aios.fragment.custom;
import android.app.Activity;
-import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
@@ -53,12 +52,11 @@ import com.uiuios.aios.R;
import com.uiuios.aios.activity.ControlActivity;
import com.uiuios.aios.activity.EmergencyActivity;
import com.uiuios.aios.activity.QuickAppActivity;
-import com.uiuios.aios.activity.alarm.AlarmClockActivity;
+import com.uiuios.aios.activity.alarm.AlarmActivity;
import com.uiuios.aios.activity.code.FamilySpaceActivity;
import com.uiuios.aios.activity.contact.ContactActivity;
import com.uiuios.aios.activity.weather.WeatherActivity;
import com.uiuios.aios.activity.weather.WeatherPresenter;
-import com.uiuios.aios.activity.wifi.WiFiManagerActivity;
import com.uiuios.aios.adapter.NotificationAdapter;
import com.uiuios.aios.adapter.SOSNnmberAdapter;
import com.uiuios.aios.alarm.AlarmUtils;
@@ -73,12 +71,10 @@ import com.uiuios.aios.config.CommonConfig;
import com.uiuios.aios.dialog.PasswordDialog;
import com.uiuios.aios.dialog.SingleDialog;
import com.uiuios.aios.disklrucache.CacheHelper;
-import com.uiuios.aios.gson.GsonUtils;
import com.uiuios.aios.manager.RemoteManager;
import com.uiuios.aios.network.NetInterfaceManager;
import com.uiuios.aios.network.UrlAddress;
import com.uiuios.aios.push.PushManager;
-import com.uiuios.aios.service.main.MainService;
import com.uiuios.aios.utils.ApkUtils;
import com.uiuios.aios.utils.AppUtil;
import com.uiuios.aios.utils.BitmapUtils;
@@ -87,9 +83,7 @@ import com.uiuios.aios.utils.SchemeUtils;
import com.uiuios.aios.utils.ToastUtil;
import com.uiuios.aios.utils.Utils;
-import java.lang.reflect.Method;
import java.lang.reflect.Type;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -889,7 +883,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
}
private void getAlarm() {
- startActivity(new Intent(mContext, AlarmClockActivity.class));
+ startActivity(new Intent(mContext, AlarmActivity.class));
// NetInterfaceManager.getInstance().getAlarmClock(new NetInterfaceManager.AlarmClockCallback() {
// @Override
// public void setAlarmClock(List alarmClockList) {
diff --git a/app/src/main/java/com/uiuios/aios/fragment/home/HomeFragment.java b/app/src/main/java/com/uiuios/aios/fragment/home/HomeFragment.java
index dca38c8..36d0c17 100644
--- a/app/src/main/java/com/uiuios/aios/fragment/home/HomeFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/home/HomeFragment.java
@@ -5,14 +5,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
import android.os.Handler;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -23,6 +15,13 @@ import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.google.gson.Gson;
import com.king.view.circleprogressview.CircleProgressView;
import com.qweather.sdk.bean.base.Code;
@@ -36,7 +35,7 @@ import com.tencent.mmkv.MMKV;
import com.uiuios.aios.BuildConfig;
import com.uiuios.aios.R;
import com.uiuios.aios.activity.EmergencyActivity;
-import com.uiuios.aios.activity.alarm.AlarmClockActivity;
+import com.uiuios.aios.activity.alarm.AlarmActivity;
import com.uiuios.aios.activity.contact.ContactActivity;
import com.uiuios.aios.activity.weather.WeatherActivity;
import com.uiuios.aios.activity.weather.WeatherPresenter;
@@ -290,12 +289,18 @@ public class HomeFragment extends BaseFragment implements HomeContact.PrecisionV
ApkUtils.openPackage(mContext, "com.uiuios.appstore");
}
});
+ iv_note_nodata.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(mContext, AlarmActivity.class));
+ }
+ });
}
@Override
public void onResume() {
super.onResume();
- Log.e(TAG, "onResume: " );
+ Log.e(TAG, "onResume: ");
mHomePresenter.getInstalledApp();
}
@@ -395,7 +400,7 @@ public class HomeFragment extends BaseFragment implements HomeContact.PrecisionV
}
private void getAlarm() {
- startActivity(new Intent(mContext, AlarmClockActivity.class));
+ startActivity(new Intent(mContext, AlarmActivity.class));
}
private void checkSosNumber() {
@@ -501,7 +506,7 @@ public class HomeFragment extends BaseFragment implements HomeContact.PrecisionV
}
- private boolean isnight() {
+ private boolean isNight() {
Calendar calendar = Calendar.getInstance();
int hour = calendar.get(Calendar.HOUR_OF_DAY);
int minute = calendar.get(Calendar.MINUTE);
@@ -542,19 +547,22 @@ public class HomeFragment extends BaseFragment implements HomeContact.PrecisionV
tv_weather.setText(now.getText());
String iconDay = weatherBean.getNow().getIcon();
Log.e("getweather", "onSuccess: iconDay = " + iconDay);
- switch (iconDay) {
- case "100":
- case "150":
- case "102":
- case "152":
- if (isnight()) {
-// cl_weather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_sun));
- } else {
-// cl_weather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_sun_night));
- }
- break;
- default:
-// cl_weather.setBackground(ContextCompat.getDrawable(mContext, R.drawable.background_weather_rain));
+ if (isNight()) {
+ cl_weather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night));
+ } else {
+ switch (weatherBean.getNow().getIcon()) {
+ default:
+ case "100":
+ case "150":
+ //晴
+ cl_weather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather));
+ break;
+ case "102":
+ case "152":
+ //少云
+ cl_weather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain));
+ break;
+ }
}
} else {
//在此查看返回数据失败的原因
diff --git a/app/src/main/java/com/uiuios/aios/fragment/second/SecondContact.java b/app/src/main/java/com/uiuios/aios/fragment/second/SecondContact.java
index 65b04a0..00d09db 100644
--- a/app/src/main/java/com/uiuios/aios/fragment/second/SecondContact.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/second/SecondContact.java
@@ -1,23 +1,26 @@
package com.uiuios.aios.fragment.second;
+import com.uiui.video.bean.VideoInfo;
import com.uiuios.aios.base.BasePresenter;
import com.uiuios.aios.base.BaseView;
-import com.uiuios.aios.bean.ActivityBean;
import com.uiuios.aios.bean.ArticleInfo;
import com.uiuios.aios.bean.GoodsInfo;
+import java.util.ArrayList;
import java.util.List;
public class SecondContact {
public interface Presenter extends BasePresenter {
void getGoods();
void getArticle();
- void getActivityList();
+ void getLivenVideoList();
+ void getKnowledgeVideoList();
}
public interface View extends BaseView {
void setGoods(List goodsInfos);
void setArticle(List articleInfoList);
- void setActivityList(List activityList);
+ void setLivenVideoList(ArrayList livenVideoList);
+ void setKnowledgeVideoList(ArrayList knowledgeVideoList);
}
}
diff --git a/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java b/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java
index 7e123f2..2201285 100644
--- a/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java
@@ -5,35 +5,31 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.os.Handler;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSnapHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.NetworkUtils;
-import com.bumptech.glide.Glide;
-import com.shehuan.niv.NiceImageView;
+import com.uiui.video.bean.VideoInfo;
import com.uiuios.aios.R;
-import com.uiuios.aios.activity.InfoListActivity;
-import com.uiuios.aios.activity.SpikeListActivity;
-import com.uiuios.aios.adapter.ActivityAdapter;
-import com.uiuios.aios.adapter.ArticleAdapter;
-import com.uiuios.aios.adapter.GoodsAdapter;
+import com.uiuios.aios.adapter.KnowledgeVideoAdapter;
+import com.uiuios.aios.adapter.LivenVideoAdapter;
+import com.uiuios.aios.adapter.NewArticleAdapter;
+import com.uiuios.aios.adapter.NewGoodsAdapter;
import com.uiuios.aios.base.BaseFragment;
-import com.uiuios.aios.bean.ActivityBean;
import com.uiuios.aios.bean.ArticleInfo;
-import com.uiuios.aios.bean.DemandBean;
import com.uiuios.aios.bean.GoodsInfo;
-import com.uiuios.aios.network.NetInterfaceManager;
import com.uiuios.aios.utils.JGYUtils;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -48,86 +44,36 @@ import butterknife.ButterKnife;
public class SecondFragment extends BaseFragment implements SecondContact.View, NetworkUtils.OnNetworkStatusChangedListener {
private static final String TAG = SecondFragment.class.getSimpleName();
- @BindView(R.id.iv_aimg)
- ImageView iv_aimg;
- @BindView(R.id.tv_title)
- TextView tv_title;
- @BindView(R.id.tv_content)
- TextView tv_content;
-
- @BindView(R.id.iv_avatar_a)
- ImageView iv_avatar_a;
- @BindView(R.id.tv_title_a)
- TextView tv_title_a;
- @BindView(R.id.tc_joined_num_a)
- TextView tc_joined_num_a;
- @BindView(R.id.tv_time_a)
- TextView tv_time_a;
- @BindView(R.id.tv_address_a)
- TextView tv_address_a;
-
- @BindView(R.id.iv_avatar_d)
- ImageView iv_avatar_d;
- @BindView(R.id.tv_title_d)
- TextView tv_title_d;
- @BindView(R.id.tc_joined_num_d)
- TextView tc_joined_num_d;
- @BindView(R.id.tv_time_d)
- TextView tv_time_d;
- @BindView(R.id.tv_address_d)
- TextView tv_address_d;
-
- @BindView(R.id.iv1)
- ImageView iv1;
- @BindView(R.id.iv2)
- ImageView iv2;
- @BindView(R.id.iv3)
- ImageView iv3;
- @BindView(R.id.iv4)
- ImageView iv4;
-
- @BindView(R.id.cl_activity)
- ConstraintLayout cl_activity;
-
- @BindView(R.id.cl_demand)
- ConstraintLayout cl_demand;
- // @BindView(R.id.cl1)
-// ConstraintLayout cl1;
- @BindView(R.id.cl2)
- ConstraintLayout cl2;
- @BindView(R.id.cl3)
- ConstraintLayout cl3;
- @BindView(R.id.cl4)
- ConstraintLayout cl4;
@BindView(R.id.rv_goods)
RecyclerView rv_goods;
@BindView(R.id.rv_article)
RecyclerView rv_article;
- @BindView(R.id.rv_activity)
- RecyclerView rv_activity;
-
-
- @BindView(R.id.nv_pic)
- NiceImageView nv_pic;
- @BindView(R.id.tv_like)
- TextView tv_like;
- @BindView(R.id.tv_comment)
- TextView tv_comment;
-
- @BindView(R.id.tv_spike_more)
- TextView tv_spike_more;
- @BindView(R.id.tv_info_more)
- TextView tv_info_more;
+ @BindView(R.id.rv_liven)
+ RecyclerView rv_liven;
+ @BindView(R.id.rv_knowledge)
+ RecyclerView rv_knowledge;
private View rootView;
private Context mContext;
private ContentResolver mCRv;
private SecondPresenter mPresenter;
- private GoodsAdapter mGoodsAdapter;
- private ArticleAdapter mArticleAdapter;
- private ActivityAdapter mActivityAdapter;
+ private NewGoodsAdapter mNewGoodsAdapter;
+ private NewArticleAdapter mNewArticleAdapter;
+ private LivenVideoAdapter mLivenVideoAdapter;
+ private KnowledgeVideoAdapter mKnowledgeVideoAdapter;
+
+ private int mCurrentGoodsIndex = 0;
+ private boolean mGoodsScrolling = false;
+ private Handler mGoodsHandler;
+ private Runnable mGoodsRunnable;
+
+ private int mCurrentArticleIndex = 0;
+ private boolean mArticleScrolling = false;
+ private Handler mArticleHandler;
+ private Runnable mArticleRunnable;
+
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -180,10 +126,13 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
mParam2 = getArguments().getString(ARG_PARAM2);
}
NetworkUtils.registerNetworkStatusChangedListener(this);
+
+
}
@Override
public void fetchData() {
+ Log.e(TAG, "fetchData: ");
initData();
}
@@ -191,60 +140,148 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
- rootView = inflater.inflate(R.layout.fragment_second, container, false);
- mContext = rootView.getContext();
- mCRv = mContext.getContentResolver();
- mPresenter = new SecondPresenter(mContext);
- mPresenter.attachView(this);
- mPresenter.setLifecycle(lifecycleSubject);
- ButterKnife.bind(this, rootView);
- initView();
+ long time = System.currentTimeMillis();
+ Log.e(TAG, "onCreateView: rootView = " + rootView);
+ if (null != rootView) {
+ ViewGroup parent = (ViewGroup) rootView.getParent();
+ if (null != parent) {
+ parent.removeView(rootView);
+ }
+ } else { // 如ongoing果rootView为空 ，就实例化该视图
+ rootView = inflater.inflate(R.layout.fragment_second, container, false);
+ mContext = rootView.getContext();
+ mCRv = mContext.getContentResolver();
+ ButterKnife.bind(this, rootView);
+ mPresenter = new SecondPresenter(mContext);
+ mPresenter.attachView(this);
+ mPresenter.setLifecycle(lifecycleSubject);
+ initView();
+ initData();
+ }
+ Log.e(TAG, "onCreateView: tiem = " + (System.currentTimeMillis() - time));
return rootView;
}
private void initView() {
- mGoodsAdapter = new GoodsAdapter();
- mArticleAdapter = new ArticleAdapter();
- mActivityAdapter = new ActivityAdapter();
+ mNewGoodsAdapter = new NewGoodsAdapter();
+ LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mContext);
+ linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+ rv_goods.setLayoutManager(linearLayoutManager);
+ rv_goods.setAdapter(mNewGoodsAdapter);
+ LinearSnapHelper snapHelper = new LinearSnapHelper();
+ snapHelper.attachToRecyclerView(rv_goods);
+ rv_goods.addOnScrollListener(new RecyclerView.OnScrollListener() {
+ @Override
+ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+ super.onScrollStateChanged(recyclerView, newState);
+ Log.e("rv_goods", "onScrollStateChanged: newState = " + newState);
+ if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+ mGoodsScrolling = false;
+ // 获取当前滚动到的条目位置
+ int firstIndex = linearLayoutManager.findFirstVisibleItemPosition();
+ Log.e("rv_goods", "onScrollStateChanged: firstIndex = " + firstIndex);
+ Log.e("rv_goods", "onScrollStateChanged: mCurrentGoodsIndex = " + mCurrentGoodsIndex);
+ mCurrentGoodsIndex = firstIndex + 1;
+ } else {
+ mGoodsScrolling = true;
+ }
+ }
- rv_goods.setLayoutManager(new LinearLayoutManager(mContext));
- rv_goods.setAdapter(mGoodsAdapter);
- rv_article.setLayoutManager(new LinearLayoutManager(mContext));
- rv_article.setAdapter(mArticleAdapter);
- rv_activity.setLayoutManager(new LinearLayoutManager(mContext));
- rv_activity.setAdapter(mActivityAdapter);
+ @Override
+ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+ super.onScrolled(recyclerView, dx, dy);
+ }
+ });
- cl_activity.setOnClickListener(new View.OnClickListener() {
+ mNewArticleAdapter = new NewArticleAdapter();
+ LinearLayoutManager linearLayoutManager2 = new LinearLayoutManager(mContext);
+ linearLayoutManager2.setOrientation(LinearLayoutManager.HORIZONTAL);
+ rv_article.setLayoutManager(linearLayoutManager2);
+ rv_article.setAdapter(mNewArticleAdapter);
+ LinearSnapHelper snapHelper2 = new LinearSnapHelper();
+ snapHelper2.attachToRecyclerView(rv_article);
+ rv_article.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
- public void onClick(View view) {
- openApp(0);
+ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+ super.onScrollStateChanged(recyclerView, newState);
+ Log.e("rv_article", "onScrollStateChanged: newState = " + newState);
+ if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+ mArticleScrolling = false;
+ // 获取当前滚动到的条目位置
+ int firstIndex = linearLayoutManager2.findFirstVisibleItemPosition();
+ Log.e("rv_article", "onScrollStateChanged: firstIndex = " + firstIndex);
+ Log.e("rv_article", "onScrollStateChanged: mCurrentArticleIndex = " + mCurrentArticleIndex);
+ mCurrentArticleIndex = firstIndex + 1;
+ } else {
+ mArticleScrolling = true;
+ }
+ }
+
+ @Override
+ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+ super.onScrolled(recyclerView, dx, dy);
}
});
- cl_demand.setOnClickListener(new View.OnClickListener() {
+
+ mGoodsHandler = new Handler();
+ mGoodsRunnable = new Runnable() {
@Override
- public void onClick(View view) {
- openApp(1);
+ public void run() {
+ if (mNewGoodsAdapter.getItemCount() == 0 || mGoodsScrolling) {
+ return;
+ }
+ Log.e(TAG, "run: " + mNewGoodsAdapter.getItemCount());
+ if (mNewGoodsAdapter.getItemCount() <= mCurrentGoodsIndex) {
+ mCurrentGoodsIndex = 0;
+ } else {
+ mCurrentGoodsIndex++;
+ }
+ rv_goods.smoothScrollToPosition(mCurrentGoodsIndex);
+ mGoodsHandler.postDelayed(this, 3000);
}
- });
- tv_spike_more.setOnClickListener(new View.OnClickListener() {
+ };
+
+ mArticleHandler = new Handler();
+ mArticleRunnable = new Runnable() {
@Override
- public void onClick(View view) {
- startActivity(new Intent(mContext, SpikeListActivity.class));
+ public void run() {
+ if (mNewArticleAdapter.getItemCount() == 0 || mArticleScrolling) {
+ return;
+ }
+ if (mNewArticleAdapter.getItemCount() <= mCurrentArticleIndex) {
+ mCurrentArticleIndex = 0;
+ } else {
+ mCurrentArticleIndex++;
+ }
+ rv_article.smoothScrollToPosition(mCurrentArticleIndex);
+ mArticleHandler.postDelayed(this, 3000);
}
- });
- tv_info_more.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- startActivity(new Intent(mContext, InfoListActivity.class));
- }
- });
+ };
+
+
+ mLivenVideoAdapter = new LivenVideoAdapter();
+ LinearLayoutManager linearLayoutManager3 = new LinearLayoutManager(mContext);
+ linearLayoutManager3.setOrientation(LinearLayoutManager.HORIZONTAL);
+ rv_liven.setLayoutManager(linearLayoutManager3);
+ rv_liven.setAdapter(mLivenVideoAdapter);
+ LinearSnapHelper snapHelper3 = new LinearSnapHelper();
+ snapHelper3.attachToRecyclerView(rv_liven);
+
+ mKnowledgeVideoAdapter = new KnowledgeVideoAdapter();
+ LinearLayoutManager linearLayoutManager4 = new LinearLayoutManager(mContext);
+ linearLayoutManager4.setOrientation(LinearLayoutManager.HORIZONTAL);
+ rv_knowledge.setLayoutManager(linearLayoutManager4);
+ rv_knowledge.setAdapter(mKnowledgeVideoAdapter);
+ LinearSnapHelper snapHelper4 = new LinearSnapHelper();
+ snapHelper4.attachToRecyclerView(rv_knowledge);
}
private void initData() {
mPresenter.getGoods();
mPresenter.getArticle();
- mPresenter.getActivityList();
- getDemandList();
+ mPresenter.getLivenVideoList();
+ mPresenter.getKnowledgeVideoList();
+
}
@Override
@@ -253,54 +290,6 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
NetworkUtils.unregisterNetworkStatusChangedListener(this);
}
- private void getDemandList() {
- NetInterfaceManager.getInstance().getDemandList(true, lifecycleSubject, new NetInterfaceManager.DemandListCallback() {
- @Override
- public void setDemandList(List demandBeans) {
- cl4.setVisibility(View.VISIBLE);
- iv4.setVisibility(View.GONE);
- DemandBean demandBean = demandBeans.get(0);
- setDemand(demandBean);
- }
-
- @Override
- public void noData() {
- cl4.setVisibility(View.GONE);
- iv4.setVisibility(View.VISIBLE);
- }
-
- @Override
- public void onError() {
-
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
-
- private void setDemand(DemandBean demandBean) {
- Glide.with(iv_avatar_d).load(demandBean.getAvatar()).error(getResources().getDrawable(R.drawable.default_head)).into(iv_avatar_d);
- tv_title_d.setText(demandBean.getTitle());
-// tv_price.setText(String.valueOf(demandBean.getPrice()));
- tc_joined_num_d.setText(demandBean.getLike_count() + "人参加");
- tv_time_d.setText(getTime(demandBean.getDemand_time()));
- tv_address_d.setText(demandBean.getAddress());
- }
-
- private void setActivity(ActivityBean activity) {
- Glide.with(iv_avatar_a).load(activity.getAvatar()).error(getResources().getDrawable(R.drawable.default_head)).into(iv_avatar_a);
- tv_title_a.setText(activity.getName());
- tc_joined_num_a.setText(activity.getJoin_num() + "人参加");
- tv_time_a.setText(getTime(activity.getAdd_time()));
- tv_address_a.setText(activity.getLocation());
- Glide.with(nv_pic).load(activity.getFile()).centerCrop().into(nv_pic);
- tv_like.setText(activity.getLike_count() + "");
- tv_comment.setText(activity.getComment_count() + "");
- }
-
private String getTime(long second) {
long ms = second * 1000L;
SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
@@ -327,34 +316,33 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
@Override
public void setGoods(List goodsInfos) {
if (goodsInfos != null && goodsInfos.size() != 0) {
- iv1.setVisibility(View.GONE);
- mGoodsAdapter.setGoodsInfoList(goodsInfos);
+ mNewGoodsAdapter.setGoodsInfoList(goodsInfos);
+ mGoodsHandler.removeCallbacks(mGoodsRunnable);
+ mGoodsHandler.postDelayed(mGoodsRunnable, 3000);
} else {
- iv1.setVisibility(View.VISIBLE);
+
}
}
@Override
public void setArticle(List articleInfoList) {
if (articleInfoList != null && articleInfoList.size() != 0) {
-// cl2.setVisibility(View.VISIBLE);
- iv2.setVisibility(View.GONE);
- mArticleAdapter.setArticleBeanList(articleInfoList);
+ mNewArticleAdapter.setArticleBeanList(articleInfoList);
+ mArticleHandler.removeCallbacks(mArticleRunnable);
+ mArticleHandler.postDelayed(mArticleRunnable, 3000);
} else {
-// cl2.setVisibility(View.GONE);
- iv2.setVisibility(View.VISIBLE);
+
}
}
@Override
- public void setActivityList(List activityList) {
- if (activityList != null && activityList.size() != 0) {
-// cl3.setVisibility(View.VISIBLE);
- iv3.setVisibility(View.GONE);
- mActivityAdapter.setActivityBeans(activityList);
- } else {
-// cl3.setVisibility(View.GONE);
- iv3.setVisibility(View.VISIBLE);
- }
+ public void setLivenVideoList(ArrayList livenVideoList) {
+ mLivenVideoAdapter.setLivenVideoList(livenVideoList);
}
+
+ @Override
+ public void setKnowledgeVideoList(ArrayList knowledgeVideoList) {
+ mKnowledgeVideoAdapter.setLivenVideoList(knowledgeVideoList);
+ }
+
}
diff --git a/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java b/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java
index b53e80a..fa67f34 100644
--- a/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java
@@ -5,12 +5,13 @@ import android.util.Log;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.FragmentEvent;
-import com.uiuios.aios.bean.ActivityBean;
+import com.uiui.video.bean.VideoInfo;
import com.uiuios.aios.bean.ArticleInfo;
import com.uiuios.aios.bean.BaseResponse;
import com.uiuios.aios.bean.GoodsInfo;
import com.uiuios.aios.network.NetInterfaceManager;
+import java.util.ArrayList;
import java.util.List;
import io.reactivex.rxjava3.annotations.NonNull;
@@ -107,27 +108,62 @@ public class SecondPresenter implements SecondContact.Presenter {
}
@Override
- public void getActivityList() {
- NetInterfaceManager.getInstance().getActivityList(true, getLifecycle(), new NetInterfaceManager.ActivitiesListCallback() {
- @Override
- public void setActivitiesList(List activityBeans) {
- mView.setActivityList(activityBeans);
- }
+ public void getLivenVideoList() {
+ NetInterfaceManager.getInstance().getLivenVideoListObservable()
+ .compose(RxLifecycle.bindUntilEvent(getLifecycle(), FragmentEvent.DESTROY))
+ .subscribe(new Observer>>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("getLivenVideoList", "onSubscribe: ");
+ }
- @Override
- public void noData() {
- mView.setActivityList(null);
- }
+ @Override
+ public void onNext(@NonNull BaseResponse> listBaseResponse) {
+ Log.e("getLivenVideoList", "onNext: " + listBaseResponse);
+ if (listBaseResponse.code==200){
+ mView.setLivenVideoList(listBaseResponse.data);
+ }
+ }
- @Override
- public void onError() {
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("getLivenVideoList", "onError: " + e.getMessage());
+ }
- }
-
- @Override
- public void onComplete() {
-
- }
- });
+ @Override
+ public void onComplete() {
+ Log.e("getLivenVideoList", "onComplete: ");
+ }
+ });
}
+
+ @Override
+ public void getKnowledgeVideoList() {
+ NetInterfaceManager.getInstance().getKnowledgeVideoListObservable()
+ .subscribe(new Observer>>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+ Log.e("getKnowledgeVideoList", "onSubscribe: ");
+ }
+
+ @Override
+ public void onNext(@NonNull BaseResponse> listBaseResponse) {
+ Log.e("getKnowledgeVideoList", "onNext: " + listBaseResponse);
+ if (listBaseResponse.code==200){
+ mView.setKnowledgeVideoList(listBaseResponse.data);
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ Log.e("getKnowledgeVideoList", "onError: " + e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+ Log.e("getKnowledgeVideoList", "onComplete: ");
+ }
+ });
+ }
+
}
diff --git a/app/src/main/java/com/uiuios/aios/gson/GetJsonDataUtil.java b/app/src/main/java/com/uiuios/aios/gson/GetJsonDataUtil.java
new file mode 100644
index 0000000..3148651
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/gson/GetJsonDataUtil.java
@@ -0,0 +1,38 @@
+package com.uiuios.aios.gson;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * <读取Json文件的工具类>
+ *
+ * @author: 小嵩
+ * @date: 2017/3/16 16:22
+
+ */
+
+public class GetJsonDataUtil {
+
+
+ public String getJson(Context context, String fileName) {
+
+ StringBuilder stringBuilder = new StringBuilder();
+ try {
+ AssetManager assetManager = context.getAssets();
+ BufferedReader bf = new BufferedReader(new InputStreamReader(
+ assetManager.open(fileName)));
+ String line;
+ while ((line = bf.readLine()) != null) {
+ stringBuilder.append(line);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return stringBuilder.toString();
+ }
+}
+
diff --git a/app/src/main/java/com/uiuios/aios/manager/AppManager.java b/app/src/main/java/com/uiuios/aios/manager/AppManager.java
index f723f5a..ecb8e57 100644
--- a/app/src/main/java/com/uiuios/aios/manager/AppManager.java
+++ b/app/src/main/java/com/uiuios/aios/manager/AppManager.java
@@ -66,6 +66,10 @@ public class AppManager {
return sInstance;
}
+ public Set getShowPackages() {
+ return showPackages;
+ }
+
public void addPakcage(String packageName) {
this.showPackages.add(packageName);
mMMKV.encode(SHOW_PACKAGE_KEY, showPackages);
diff --git a/app/src/main/java/com/uiuios/aios/manager/RemoteManager.java b/app/src/main/java/com/uiuios/aios/manager/RemoteManager.java
index ad69b11..2eff83d 100644
--- a/app/src/main/java/com/uiuios/aios/manager/RemoteManager.java
+++ b/app/src/main/java/com/uiuios/aios/manager/RemoteManager.java
@@ -14,6 +14,7 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.tencent.bugly.crashreport.CrashReport;
import com.tencent.mmkv.MMKV;
+import com.uiuios.aios.BuildConfig;
import com.uiuios.aios.bean.MapBean;
import com.uiuios.aios.config.CommonConfig;
import com.uiuios.aios.disklrucache.CacheHelper;
@@ -118,6 +119,7 @@ public class RemoteManager {
* @return 获取sn
*/
public String getSerial() {
+// if (BuildConfig.DEBUG) return "MTK0002306120556370";
if (mGetInfoInterface != null) {
try {
return mGetInfoInterface.getSerial();
@@ -180,6 +182,16 @@ public class RemoteManager {
}
}
+ public String getDistrict() {
+ getLocation();
+ MapBean mapBean = getMapBean();
+ if (mapBean == null) {
+ return "北京";
+ } else {
+ return mapBean.getDistrict();
+ }
+ }
+
public double getLongitude() {
MapBean mapBean = getMapBean();
if (mapBean == null) {
diff --git a/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java b/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
index 9198694..dffe7ee 100644
--- a/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
@@ -10,16 +10,19 @@ import com.tencent.mmkv.MMKV;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.trello.rxlifecycle4.android.FragmentEvent;
+import com.uiui.video.bean.VideoInfo;
import com.uiuios.aios.alarm.AlarmUtils;
import com.uiuios.aios.bean.ActivityBean;
import com.uiuios.aios.alarm.AlarmClockData;
import com.uiuios.aios.bean.AlarmClockId;
import com.uiuios.aios.bean.ArticleInfo;
import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.CategoryBean;
import com.uiuios.aios.bean.Contact;
import com.uiuios.aios.bean.DemandBean;
import com.uiuios.aios.bean.GoodsInfo;
import com.uiuios.aios.bean.HealthCode;
+import com.uiuios.aios.bean.MapGeoBean;
import com.uiuios.aios.bean.NetDesktopIcon;
import com.uiuios.aios.bean.SnInfo;
import com.uiuios.aios.bean.SystemSettings;
@@ -39,6 +42,7 @@ import com.uiuios.aios.network.api.AlarmClockEditApi;
import com.uiuios.aios.network.api.AlarmClockQueryApi;
import com.uiuios.aios.network.api.AppUsageRecordApi;
import com.uiuios.aios.network.api.ArticleListApi;
+import com.uiuios.aios.network.api.CategorysApi;
import com.uiuios.aios.network.api.DemandListApi;
import com.uiuios.aios.network.api.GetAdminSnSettingApi;
import com.uiuios.aios.network.api.GetDesktopApi;
@@ -46,6 +50,8 @@ import com.uiuios.aios.network.api.GetMailList;
import com.uiuios.aios.network.api.GetUserIDApi;
import com.uiuios.aios.network.api.GoodsListApi;
import com.uiuios.aios.network.api.HealthCodeApi;
+import com.uiuios.aios.network.api.KnowledgeVideoListApi;
+import com.uiuios.aios.network.api.LivenVideoListApi;
import com.uiuios.aios.network.api.MailListAddApi;
import com.uiuios.aios.network.api.RunNewApp;
import com.uiuios.aios.network.api.SNInfoApi;
@@ -56,11 +62,12 @@ import com.uiuios.aios.network.api.UpdateAlarmClockApi;
import com.uiuios.aios.network.api.UpdateAppIconApi;
import com.uiuios.aios.network.api.UpdateDesktopApi;
import com.uiuios.aios.network.api.UserInfoControl;
+import com.uiuios.aios.network.api.amap.GeocodingApi;
import com.uiuios.aios.network.interceptor.RepeatRequestInterceptor;
-import com.uiuios.aios.utils.Utils;
import java.io.File;
import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -91,6 +98,8 @@ public class NetInterfaceManager {
private Retrofit mRetrofit;
private OkHttpClient okHttpClient;
+ private Retrofit mAmapRetrofit;
+ private OkHttpClient mAmapOkHttpClient;
private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
private final ConcurrentHashMap requestIdsMap = new ConcurrentHashMap<>();
@@ -130,6 +139,31 @@ public class NetInterfaceManager {
.addCallAdapterFactory(RxJava3CallAdapterFactory.create())
.build();
}
+
+ if (mAmapOkHttpClient == null) {
+ //如果无法生存缓存文件目录，检测权限使用已经加上，检测手机是否把文件读写权限禁止了
+ OkHttpClient.Builder builder = new OkHttpClient.Builder();
+ builder.connectTimeout(timeOut, TimeUnit.SECONDS); // 设置连接超时时间
+ builder.writeTimeout(timeOut, TimeUnit.SECONDS);// 设置写入超时时间
+ builder.readTimeout(timeOut, TimeUnit.SECONDS);// 设置读取数据超时时间
+ builder.retryOnConnectionFailure(true);// 设置进行连接失败重试
+ builder.addInterceptor(new RepeatRequestInterceptor());
+
+ // 设置缓存文件路径
+ String cacheDirectory = mContext.getExternalCacheDir().getAbsolutePath() + "/OkHttpCache";
+ Cache cache = new Cache(new File(cacheDirectory), cacheSize);
+ builder.cache(cache);// 设置缓存
+ mAmapOkHttpClient = builder.build();
+ }
+
+ if (mAmapRetrofit == null) {
+ mAmapRetrofit = new Retrofit.Builder()
+ .client(mAmapOkHttpClient)
+ .baseUrl(UrlAddress.AMAP_ROOT_URL)
+ .addConverterFactory(GsonConverterFactory.create())
+ .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
+ .build();
+ }
}
/**
@@ -169,6 +203,13 @@ public class NetInterfaceManager {
return okHttpClient;
}
+ public Observable getGeoObservable(String address) {
+ return mAmapRetrofit.create(GeocodingApi.class)
+ .geocoding(address, "json", "RGAsG7hN9gbDxeruqF4Lsf0ro6pp362O")
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
+ }
+
/**
* 通过sn获取设备的信息
*
@@ -237,6 +278,13 @@ public class NetInterfaceManager {
.observeOn(AndroidSchedulers.mainThread());
}
+ public Observable>> getCategorysObservable() {
+ return mRetrofit.create(CategorysApi.class)
+ .getCategorys(RemoteManager.getInstance().getSerial())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
+ }
+
public Observable>> getArticleListObservable() {
return mRetrofit.create(ArticleListApi.class)
.getArticleList(RemoteManager.getInstance().getSerial())
@@ -279,7 +327,15 @@ public class NetInterfaceManager {
public Observable>> getAlarmClockObservable() {
return mRetrofit
.create(AlarmClockApi.class)
- .getAlarmClockApiApi(RemoteManager.getInstance().getSerial())
+ .getAlarmClock(RemoteManager.getInstance().getSerial(), 0)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
+ }
+
+ public Observable>> getAlarmClockObservable(int type) {
+ return mRetrofit
+ .create(AlarmClockApi.class)
+ .getAlarmClock(RemoteManager.getInstance().getSerial(), type)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -312,6 +368,21 @@ public class NetInterfaceManager {
.observeOn(AndroidSchedulers.mainThread());
}
+ public Observable>> getLivenVideoListObservable() {
+ return mRetrofit.create(LivenVideoListApi.class)
+ .getLivenVideoList(RemoteManager.getInstance().getSerial())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
+ }
+
+ public Observable>> getKnowledgeVideoListObservable() {
+ return mRetrofit.create(KnowledgeVideoListApi.class)
+ .getKnowledgeVideoList(RemoteManager.getInstance().getSerial())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
+ }
+
+
public interface onCompleteCallback {
void onComplete();
}
diff --git a/app/src/main/java/com/uiuios/aios/network/UrlAddress.java b/app/src/main/java/com/uiuios/aios/network/UrlAddress.java
index 2b13a13..25708d0 100644
--- a/app/src/main/java/com/uiuios/aios/network/UrlAddress.java
+++ b/app/src/main/java/com/uiuios/aios/network/UrlAddress.java
@@ -2,6 +2,8 @@ package com.uiuios.aios.network;
public class UrlAddress {
public static final String ROOT_URL = "https://led.zuoyepad.com/android/";
+ public static final String AMAP_ROOT_URL = "https://api.map.baidu.com/";
+
/*设备信息接口*/
public static final String SNINFO = "sn/getSnInfo";
/*获取用户头像和信息*/
@@ -24,6 +26,8 @@ public class UrlAddress {
public static final String GET_DESKTOP_LAYOUT = "getDesktopLayout";
/*获取抢购列表*/
public static final String GET_GOODS_LIST = "getGoodsList";
+ /*养生资讯分类*/
+ public static final String CATEGORYS = "article/categorys";
/*获取资讯列表*/
public static final String GET_ARTICLE_LIST = "getArticleList";
/*获取抢购详情*/
@@ -65,4 +69,13 @@ public class UrlAddress {
public static final String GET_USER_ID = "getUserId";
+
+
+ /*养生视频列表*/
+ public static final String GET_LIVEN_VIDEO_LIST = "livenVideo/getLivenVideoList";
+ /*知识视频列表*/
+ public static final String GET_KNOWLEDGE_VIDEO_LIST = "knowledgeVideo/getKnowledgeVideoList";
+
+ public static final String geocoding = "geocoding/v3/";
+
}
diff --git a/app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java b/app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java
index 1a4e68b..91b36a8 100644
--- a/app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java
@@ -12,7 +12,8 @@ import retrofit2.http.Query;
public interface AlarmClockApi {
@GET(UrlAddress.GET_ALARM_CLOCK)
- Observable>> getAlarmClockApiApi(
- @Query("sn") String sn
+ Observable>> getAlarmClock(
+ @Query("sn") String sn,
+ @Query("class") int clazz
);
}
diff --git a/app/src/main/java/com/uiuios/aios/network/api/CategorysApi.java b/app/src/main/java/com/uiuios/aios/network/api/CategorysApi.java
new file mode 100644
index 0000000..291a1a0
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/network/api/CategorysApi.java
@@ -0,0 +1,18 @@
+package com.uiuios.aios.network.api;
+
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.CategoryBean;
+import com.uiuios.aios.network.UrlAddress;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface CategorysApi {
+ @GET(UrlAddress.CATEGORYS)
+ Observable>> getCategorys(
+ @Query("sn") String sn
+ );
+}
diff --git a/app/src/main/java/com/uiuios/aios/network/api/KnowledgeVideoListApi.java b/app/src/main/java/com/uiuios/aios/network/api/KnowledgeVideoListApi.java
new file mode 100644
index 0000000..c49450c
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/network/api/KnowledgeVideoListApi.java
@@ -0,0 +1,19 @@
+package com.uiuios.aios.network.api;
+
+import com.uiui.video.bean.VideoInfo;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.UrlAddress;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface KnowledgeVideoListApi {
+ @GET(UrlAddress.GET_KNOWLEDGE_VIDEO_LIST)
+ Observable>> getKnowledgeVideoList(
+ @Query("sn") String sn
+ );
+}
diff --git a/app/src/main/java/com/uiuios/aios/network/api/LivenVideoListApi.java b/app/src/main/java/com/uiuios/aios/network/api/LivenVideoListApi.java
new file mode 100644
index 0000000..eadd885
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/network/api/LivenVideoListApi.java
@@ -0,0 +1,18 @@
+package com.uiuios.aios.network.api;
+
+import com.uiui.video.bean.VideoInfo;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.UrlAddress;
+
+import java.util.ArrayList;
+
+import io.reactivex.rxjava3.core.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface LivenVideoListApi {
+ @GET(UrlAddress.GET_LIVEN_VIDEO_LIST)
+ Observable>> getLivenVideoList(
+ @Query("sn") String sn
+ );
+}
diff --git a/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java b/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java
new file mode 100644
index 0000000..28fb6f2
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java
@@ -0,0 +1,17 @@
+package com.uiuios.aios.network.api.amap;
+
+import com.uiuios.aios.bean.MapGeoBean;
+import com.uiuios.aios.network.UrlAddress;
+
+import io.reactivex.rxjava3.core.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface GeocodingApi {
+ @GET(UrlAddress.geocoding)
+ Observable geocoding(
+ @Query("address") String address,
+ @Query("output") String output,
+ @Query("ak") String key
+ );
+}
diff --git a/app/src/main/java/com/uiuios/aios/service/main/MainService.java b/app/src/main/java/com/uiuios/aios/service/main/MainService.java
index bb5ce9e..536ad75 100644
--- a/app/src/main/java/com/uiuios/aios/service/main/MainService.java
+++ b/app/src/main/java/com/uiuios/aios/service/main/MainService.java
@@ -70,6 +70,31 @@ public class MainService extends BaseService implements MainSContact.MainSView,
}
}
+ private uploadAlarmClockReceiver mUploadAlarmClockReceiver;
+
+ private void registerRefreshReceiver() {
+ if (mUploadAlarmClockReceiver == null) {
+ mUploadAlarmClockReceiver = new uploadAlarmClockReceiver();
+ }
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(uploadAlarmClockReceiver.UPLOAD_ALARM_RECEIVER_ACTION);
+ registerReceiver(mUploadAlarmClockReceiver, filter);
+ }
+
+
+ public class uploadAlarmClockReceiver extends BroadcastReceiver {
+ public static final String UPLOAD_ALARM_RECEIVER_ACTION = "Receiver_Upload_AlarmClock_Action";
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ Log.e("uploadAlarmClockReceiver", "onReceive: " + action);
+ if (!TextUtils.isEmpty(action)) {
+ mPresenter.addAlarmClock();
+ }
+ }
+ }
+
@Override
public IBinder onBind(Intent intent) {
Log.e(TAG, "onBind: ");
@@ -94,6 +119,7 @@ public class MainService extends BaseService implements MainSContact.MainSView,
registerAlarmReceiver();
registerTimeReceiver();
registerLockScreenReceiver();
+ registerRefreshReceiver();
}
@Override
@@ -116,6 +142,9 @@ public class MainService extends BaseService implements MainSContact.MainSView,
if (lockScreenReceiver != null) {
unregisterReceiver(lockScreenReceiver);
}
+ if (mUploadAlarmClockReceiver != null) {
+ unregisterReceiver(mUploadAlarmClockReceiver);
+ }
}
@Override
@@ -139,7 +168,7 @@ public class MainService extends BaseService implements MainSContact.MainSView,
return powerManager.isInteractive();
}
- public static final String ALARMWAKEUP = "ALARM_WAKEUP";
+ public static final String ALARMWAKEUP = "AIOS_ALARM_WAKEUP";
private void registerAlarmReceiver() {
if (alarmReceiver == null) {
diff --git a/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java b/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
index b4c51bb..a2b536f 100644
--- a/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
@@ -19,7 +19,9 @@ import androidx.annotation.RequiresApi;
import com.uiuios.aios.BuildConfig;
import com.uiuios.aios.R;
+import com.uiuios.aios.activity.QuickAppActivity;
import com.uiuios.aios.bean.DesktopIcon;
+import com.uiuios.aios.manager.AppManager;
import com.uiuios.aios.manager.AppStatusManager;
import com.uiuios.aios.receiver.InstallResultReceiver;
@@ -34,6 +36,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
+import java.util.stream.Collectors;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Observable;
@@ -156,6 +159,8 @@ public class ApkUtils {
* @return
*/
public static ArrayList queryFilterAppInfo(Context context) {
+ List quickApps= new ArrayList<>(AppManager.getInstance().getAddPackages());
+
PackageManager pm = context.getPackageManager();
// 查询所有已经安装的应用程序
List resolveInfos = new ArrayList<>();
@@ -179,6 +184,9 @@ public class ApkUtils {
}
for (ResolveInfo resolveInfo : resolveinfoList) {
String pkg = resolveInfo.activityInfo.packageName;
+ if (quickApps.contains(pkg)) {
+ continue;
+ }
if (appIsDisable(context, pkg)) {
Log.e(TAG, "queryFilterAppInfo: disable = " + pkg);
continue;
diff --git a/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java b/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java
index 150513b..f5cd100 100644
--- a/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java
@@ -13,7 +13,9 @@ import android.graphics.Typeface;
import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
import android.os.Build;
+import android.util.Log;
import com.uiuios.aios.R;
@@ -64,15 +66,24 @@ public class BitmapUtils {
return null;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && drawable instanceof AdaptiveIconDrawable) {
+
Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
drawable.draw(canvas);
return Utils.getRoundedBitmap(bitmap, context);
+ } else if (drawable instanceof VectorDrawable) {
+ Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(),
+ drawable.getOpacity() != PixelFormat.OPAQUE ? Bitmap.Config.ARGB_8888 : Bitmap.Config.RGB_565);
+ Canvas canvas = new Canvas(bitmap);
+ drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+ drawable.draw(canvas);
+ return Utils.getRoundedBitmap(bitmap, context);
} else {
return Utils.getRoundedBitmap(((BitmapDrawable) drawable).getBitmap(), context);
}
} catch (Exception e) {
+ Log.e("getIconBitmap", "getIconBitmap: " + e.getMessage());
return null;
}
}
diff --git a/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java b/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java
index 18eb897..e0b58e7 100644
--- a/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java
@@ -27,6 +27,12 @@ public class TimeUtils {
return sdf.format(date);
}
+ public static String transferSecondgToDate(long second) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date(second * 1000);
+ return sdf.format(date);
+ }
+
public static String secToTime(int totalSecs) {
int hours = totalSecs / 3600;
int minutes = (totalSecs % 3600) / 60;
diff --git a/app/src/main/java/com/uiuios/aios/view/ImageViewAdapter.java b/app/src/main/java/com/uiuios/aios/view/ImageViewAdapter.java
new file mode 100644
index 0000000..fd442db
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/view/ImageViewAdapter.java
@@ -0,0 +1,66 @@
+package com.uiuios.aios.view;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.databinding.BindingAdapter;
+
+import com.bumptech.glide.Glide;
+import com.uiuios.aios.utils.TimeUtils;
+
+public class ImageViewAdapter {
+// @BindingAdapter("android:src")
+// public static void setSrc(ImageView view, Bitmap bitmap) {
+// view.setImageBitmap(bitmap);
+// }
+//
+// @BindingAdapter("android:src")
+// public static void setSrc(ImageView view, int resId) {
+// view.setImageResource(resId);
+// }
+//
+// @BindingAdapter("imageUrl")
+// public static void setSrc(ImageView imageView, String url) {
+// Glide.with(imageView.getContext())
+// .load(url)
+// .error(R.mipmap.ic_launcher)
+// .into(imageView);
+// }
+//
+// @BindingAdapter({"app:imageUrl", "app:placeHolder", "app:error"})
+// public static void loadImage(ImageView imageView, String url, Drawable holderDrawable, Drawable errorDrawable) {
+// Glide.with(imageView.getContext())
+// .load(url)
+// .placeholder(holderDrawable)
+// .error(errorDrawable)
+// .into(imageView);
+// }
+//
+// @BindingAdapter({"app:imageUrl", "app:errorDrawableId", "app:placeDrawableId"})
+// public static void loadImage(ImageView imageView, String url, int errorDrawableId, int placeDrawableId) {
+// Glide.with(imageView.getContext())
+// .load(url)
+// .error(errorDrawableId)
+// .placeholder(placeDrawableId)
+// .into(imageView);
+// }
+
+ /**
+ * 自定义设置图片属性 - 在匹配时自定义命名空间会被忽略
+ */
+ @BindingAdapter({"imageUrl", "error"})
+ public static void loadImage(ImageView imageView, String url, Drawable error) {
+ Glide.with(imageView.getContext())
+ .load(url)
+ .error(error)
+ .into(imageView);
+ }
+ @BindingAdapter({"setTime"})
+ public static void setTime(TextView textView, long timestamp) {
+ textView.setText(TimeUtils.transferSecondgToDate(timestamp));
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/uiuios/aios/view/StartSnapHelper.java b/app/src/main/java/com/uiuios/aios/view/StartSnapHelper.java
new file mode 100644
index 0000000..794fb7d
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/view/StartSnapHelper.java
@@ -0,0 +1,105 @@
+package com.uiuios.aios.view;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSnapHelper;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Created by zhouwei on 17/3/30.
+ */
+
+public class StartSnapHelper extends LinearSnapHelper {
+
+ private OrientationHelper mHorizontalHelper, mVerticalHelper;
+
+ @Nullable
+ @Override
+ public int[] calculateDistanceToFinalSnap(RecyclerView.LayoutManager layoutManager, View targetView) {
+ int[] out = new int[2];
+ if (layoutManager.canScrollHorizontally()) {
+ out[0] = distanceToStart(targetView, getHorizontalHelper(layoutManager));
+ } else {
+ out[0] = 0;
+ }
+ if (layoutManager.canScrollVertically()) {
+ out[1] = distanceToStart(targetView, getVerticalHelper(layoutManager));
+ } else {
+ out[1] = 0;
+ }
+ return out;
+ }
+
+ private int distanceToStart(View targetView, OrientationHelper helper) {
+ return helper.getDecoratedStart(targetView) - helper.getStartAfterPadding();
+ }
+
+ @Nullable
+ @Override
+ public View findSnapView(RecyclerView.LayoutManager layoutManager) {
+ if (layoutManager instanceof LinearLayoutManager) {
+
+ if (layoutManager.canScrollHorizontally()) {
+ return findStartView(layoutManager, getHorizontalHelper(layoutManager));
+ } else {
+ return findStartView(layoutManager, getVerticalHelper(layoutManager));
+ }
+ }
+
+ return super.findSnapView(layoutManager);
+ }
+
+
+
+ private View findStartView(RecyclerView.LayoutManager layoutManager,
+ OrientationHelper helper) {
+ if (layoutManager instanceof LinearLayoutManager) {
+ int firstChild = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
+ //需要判断是否是最后一个Item，如果是最后一个则不让对齐，以免出现最后一个显示不完全。
+ boolean isLastItem = ((LinearLayoutManager) layoutManager)
+ .findLastCompletelyVisibleItemPosition()
+ == layoutManager.getItemCount() - 1;
+
+ if (firstChild == RecyclerView.NO_POSITION || isLastItem) {
+ return null;
+ }
+
+ View child = layoutManager.findViewByPosition(firstChild);
+
+ if (helper.getDecoratedEnd(child) >= helper.getDecoratedMeasurement(child) / 2
+ && helper.getDecoratedEnd(child) > 0) {
+ return child;
+ } else {
+ if (((LinearLayoutManager) layoutManager).findLastCompletelyVisibleItemPosition()
+ == layoutManager.getItemCount() - 1) {
+ return null;
+ } else {
+ return layoutManager.findViewByPosition(firstChild + 1);
+ }
+ }
+ }
+
+ return super.findSnapView(layoutManager);
+ }
+
+
+ private OrientationHelper getHorizontalHelper(
+ @NonNull RecyclerView.LayoutManager layoutManager) {
+ if (mHorizontalHelper == null) {
+ mHorizontalHelper = OrientationHelper.createHorizontalHelper(layoutManager);
+ }
+ return mHorizontalHelper;
+ }
+
+ private OrientationHelper getVerticalHelper(RecyclerView.LayoutManager layoutManager) {
+ if (mVerticalHelper == null) {
+ mVerticalHelper = OrientationHelper.createVerticalHelper(layoutManager);
+ }
+ return mVerticalHelper;
+
+ }
+}
diff --git a/app/src/main/res/drawable-hdpi/actions_about.png b/app/src/main/res/drawable-hdpi/actions_about.png
index bf8fb6876b982ad5fd622ac0da5ef4693d843445..b4a331e40688c88990ab52f113989f9ff01cd1b2 100644
GIT binary patch
delta 1804
zcmZ{le>~HPAIFiV#_Z6^VvLV0boThL&JHLv}k4osceK0pa52q^qgzeBtfxMo*hlhJC}L
z2klv?4Z>8uZu79>9u^
zAIX991=~k2-Z{Y76)Ft+ra|~}M08@!tmije_2VC^oH|anPZL-D(jUEadAE4}?X1()
z(Wrs5crg1xpJChXD)@xDNneOOT0Zl>qgK8oZrhf!#2GI&LV@ceohS^Lp
zLUK{P_wU&C%yauTtBtY7h2n9!C&9{RvNWMhTX{R0N?th9O1?)ibBh-mZ3}&k*Rnc&{M9@+${gR1Ps+>
z$HWvxUW*eRIZO=|m-JOUAM_Zb(?V;nwTs?v2)8?x@tdv_oOcDCM8htClvTr#(%#u(
zG+H#$`|(jNUF>^`ussu*sfyvgR)EJzA1^99+PrvTRfF^larX3*h4=NCR)}+S{G<9n
z>Qr@+QM^I1P2ed~@Z`@gx6{Bc)jTCPAiP?!7b-foWZ|H1{n}$B1!qYQ
zc=Dp~r!StaUm~1Ay2o5Yd4AjIxCHZ3}Kw>XemrUW64UHlJ_V0u6B{@eN^iBr(Ji&
zV|fVe8BQU$2}g?BJGJv>!%I`}&2$dJPS3ZU2j2`&e=kq;s;=P%1XI
zy8+My9NZZ`0BZYbb?Q_w9m$+O&vi;Js|R?Mx)axn;ap>>7!{1=aJW?@
z<0`QYY-?C$ibY~ss*)ZO8>I?2{r{|J6*T!K!U*w8k8_#9UokW&Qi+jhUzT|>VjgD+YhPfqKg
zNTz^NiiDrIep3;GxmIQ|r$l^MAGVhGOYg7(y7_T0c+;*q%}-^K3SDWZmFb>VpZ*#*
z6H42@Azp;Ddx1v-EDUV#m9t;XZ5auM^5TL53xXW9^OTJPfs|Uo#czvldETqL-!_j}
zXdPhk&j_9oBk#r0u?JQ+M!ziZ3m4YTn2GGph2M>#>jR&>zB3qy>qx=nv9{PR1M6uDbr!zi!Vuj8B$)E_KiZMq@TlNmb79+)l
z8)oa#6_a3D0}?jMpGxH|`(%>_m+E44hF)piG_~bjFcIlx1n?7~eG{5%FaJokPXGdS
zAE9dj=HNl_zEAd2`j%VIPsD4AC-q!1hpqvYj2pJTC*nRD+O#6j$7>uSS!UqXPs%lU
w`0}r$X#F=KuY7V#kM;F0Z&qxBJB`$c3v8Ei`1iiyst2d$?cwj?mT#5fa)nK*MIX{cxtNyITqTSsj}GTNDOOGKw8Qx(=xP1x5kIvkNxnz@ALeh|L^&IeBYS&n!$>~LxVuZ
zpBV!H01%Twjo7=yy&)MH?rr1J*KQKn7kW?$s|<{v_qVYkaVoaRMH3U~%z^z3k)bpPH9;EmkLBp&
z&4?CY^8TYGR)ssRMs9kQcAT1xA4X}f!V)qlzw9iVJ+bJqSRzmd0buHCjo
zLS)X}yOp1sFRMBp<9)Vp16VD!(QfDOtj(j<#NCoV4XxgJvT=OTAl9OhbSVJWBZg&7@`m>E&}LP9p-OH|_-`srfp
z3w%_ZD9Si$Ii*qe+Do6M_KU{x{~=_lzKqgtefV5%5`{E-5&dWO6qs@gwhcKFn_
z2}$cCKyCMC_*i(1f$3WHvo|Q7t>Ea+@B&F{Z`5`_^Pdi_s?@;sH|)>5Wy>ZUbsJPW
zpb56y^?$ro;Xi`7=OTRTS~X`P4arMROX~&WOln5u2iqPr?Po&;xBRjiD2t~4ZcCTr
zhhBCXO2*d$8ZCoTu4F}s*k1#O$8`MjCrf-Hv6_Q9?(xg
z6;bI4Q^z?reUIc6PW$)ol0r$X)-)PS4&06$H{-p{z
z>uUX_MO#ilunoA?YBM$T6#dfT4`2(Qrq$`p9{BK$Lu4@eyhP
z^8oO&+`jCINVVA%@Qc&6BU5T*xALkuDJ(FQf(TQP7#9_>SMYAJa;x2AQ!dqA0^^{T
z7~Wbr7o`()dXhzuZ5-uXmqH*b8Tlj_Ht(YILAc^r3h~v7Bl-1)carOP(njJ|bKcDm
zm=*(m4xC^+xW0S0kNIiGlqo~oS-o~2RfHJw5FxGGeFZ&fTb;U*nk(m$wYa2t>oUmD
z!+pb?oI2iS*L#y6^ZAZdbikBn0(eybCH
z@D^-TbZ
XZy>-AJ$B7|j|IS_g;LuBPv-pv=vv*<
diff --git a/app/src/main/res/drawable-hdpi/actions_account.png b/app/src/main/res/drawable-hdpi/actions_account.png
index 83f3f49767a714aa5140f5d8bdeade5cef418ec9..e926efbd24b4b902463ee45091301448cb6dfdb3 100644
GIT binary patch
delta 1804
zcmZ{lYdqA68pn}FjTy6O#4z$li&AqRx6sTWx3N~EusLSkiW!$mXgTx8*l}H?+QE_<
z8I;@59utaL_i+icYRF}B`V{RrRJJH}cFv3Q*;jo&&-47=e1G4!&nWDz9+2nncLEMY
zLDkgM;9j0?0jiAr-|m5^ZsPKF#udO?-TaDo(LutI2rLd~MkXJ{5lLh+&ejZ%#o;kn
z)sTj$(Bi>H*$y{BVY-W8rCO$GD<)Y11GYu0nB8i5>5~&VUDxQSHxx3rDQ)nJ|
z5&@6(AP^nw-L9Vb8=`y>D$~IJ-(>eiXytE{{TCt2T~x4f27yvj+x^nZjlxKsQ-*%W
zW(4kAs0qYXylHi}<;=5U=
z>m!l<=ZRp}Xsjf@KiwyKQqMg@{_g$K#fd$J_HRa<#Cie|rXtkGkBb=Y;~N$i-hQ|aa6zk77
zrzGSNEqBMOhiRVmyu>t2hbT1(Uij=s&@RbLK$RTfB79_@X?*Ul$6veJ_5GqE#YTMgAt~A7o}i`
z4ktRgFycn6=-5$Oh@`l;{KbI#7=s>CbE8fCZd0_=p^V#do#4LD?;sm=0(P0zTp9hn
z4Njw3Bdw1Z+1$x_uo}8=A|qvWsJ8{+bJNBPOOH1#o?6qedyYJRcFEl9W^@b0IV$dP
zT>x!6)vbHHB_CdnS?r`ghzZf105k1;GIx(qPa5zi!w3Wob<%uO#m{lW|5l)6cx)r2
z+B!wr>CqiG8Z3;sxdmrKKpPS@xy
zv@@!dSi`r6RHhgdo~CN7X?$OKu{1D*
z`*!wQk!EhIWE$o3XXlY^^X!#&r)JMd=c&SUU24!}Vd9m?D`meY+AiJecLe>M=pFv+
zjTe%^!;IzPvrn4joL1(~h++!=%yKa%bz)Q7*1kbTaSYCdT!fLIG7t77?2<6pq;C1=ntUQ2rvJm@Q%lW+J~+4
z$c2`Emf)Q5IXU7%ECYXNZFA)7eBUrp&5Wto_CnbGXoeo}+4Fn-0ojWIF{J5wnQk^P
z%Ys_e*73$yrn(vyy_c-(LnZ2;*6RmyhWyZJW>!;K^Fp+KOBIOdx>9vl-NJs5jD8#B
zpHKm9DA~nI6qU;t0%Hg36b5^rZ3YMB!FFh~zU;eM0IY$-;6v}MrL=8I_fO;-t555A_FRSrR61_Z@_|hFWMJKb#GI^lh+vz7*FP)Q
x6=BQ2+C}NT4SwyNQ*xrWZ+WYH2i$F_Mqc2!lp%ib2~#~dH7|ERw`M9c>n})tCj$Tg
delta 1035
zcmew?bec!8Gr-TCmrII^fq{Y7)59eQNSgz(AqN|ftZOoio~Wq7C^6BiPt`y-*}%*|
z!OT$4(AdP-#7IZM$iUD*-@s7c&_LJF!pgwR%EWl%UnNFH)5%&)GBE}&W(Jm)CMHJ4
zZsvxDuErLoPNo*-rluz5POiqLu8v9y6}bhzzE&>z$)&lec_p4Mwn{(|y_C!pE2v&m
zTzV%jVlsePV1!GNl0tDwP->c03T_LGap|3`$Lv%ur;||3z`%6U)5S5Q;?|v6z8S)S
z0>_V=EMsAEa^#TXYHeEHaG{yQwOfFLqt)wUfB@6HmPd{nSGogM{9ugpTB*?GnxU!1
zwdlu1Z^sQGSDKZgxOBOW&TCop!1HnaE@7!9C-cglFWqeYp?%U>zkBPAt@H0y?_M6X
zG9V&)mc`W<^+jSh?R#VTqVrF#+`BzIJ0!Io`D0xIgx9g}lKFIRlFJ>PJGvUe
z5C3gsSh+{L;Lm(}k&Etbmu|`2*)VDTrnJI~4W~Vyc$~am=v`26dur;s>q2)NpDJC?
zA#@oyC?`CE8cq@RKeS64~|WJn5KJht+RGl!TB|%8p2+6
zVkw5%TzOKrLOv8)(+k?ku#%JwQoy2n_?
zd2iFN*D>>(mwD8GKO-qK|8Q)}zDeap#Yfavr7zUqeSzBRIF%C_%A*GZtuy@dlZs6S+}o0c2Pq!uTcA@VFueThkM+t
zjSqJ;t@YA+a$;NIsZZR@>ob4%cFI276tr)7mW&AJ^<%;3gi5N^cbLr#Vb|Dq?BLGm
z-#TFr-K0u{3O8F{{b{CpGkEF7~V
n=T)CJegTe~DWM4fU+t)(
diff --git a/app/src/main/res/drawable-hdpi/actions_booktag.png b/app/src/main/res/drawable-hdpi/actions_booktag.png
index 538c60dc2f2033534dbd4ca329b870d47ccbebe0..96aa3021c0387d6f9973a96b066bdcf862379a52 100644
GIT binary patch
delta 1804
zcmZ{le>~HPAIFhKV|Hj_Og`xRNX>rw721aUnsb`M{p0(%zj{30@AvDU=j-|JyHE3t9#9Y%a0~`T
zLRC~$U_Ra+LCTE&-)cgXH+khM?Gj+EYJSPLPd%zsRCd4c@gULC=M~}K
zFloVi7wdvCRj=DUEjdT)HEnnWXzf7JVAks!5oQpE$3Q7-wh=UA8GoFC`yLPtOB)9(
z3=bgLa2|i>=*2s>bj>h9@HdTum!rZH>!!WG;c6cLQ0>xrvSWt0=AZHCrQ5ru^Ka)|
zu8u_yp2dSX5Bd$-_f*3tRgL>YWihhZ_nmdJWm%i-i!J>v*L1xjP*aFTxG7Uiq8Q{b
zLNaf8Wo8qWL^YI->I_1b}hy27>eWKk!G(2`KbHqqWwt4a0>NINJEvfdj05v0U
zW{e`}8e7gG=-JZmQH;Ej#U`5~Kcn^RF24kxMy85MvZ$3n_1HFuYfQqU
zh9Jszx<~IsTOq6xz0^&;7Z;{G31&O^W$zv%A2;AmMc{C1s)U7>s-F`^|06?6u=dT6
zTI)1%w^wh%gHV3d^(`0^0@@JBsTD>yvK|~nUqJ%?-gJIMjeH+ecx>6+NzdxF=V&U<
zf)@DXMbS@RJg1^AKfC$T60r~O`yT2!Dv9;7ygt14qj|0qZDG56X0uQo1oOKDgez$B
z{CKf9sbznSExDwKTacKq)620NLjYY>MgqDZ-hHeL#-}o+WeoBA6FhgjsEvLKW#W_O
zUD0?xLTi>?#A(J+BS)P3fP>UhsbD5)6e<~jQPRJD;j~dpgagSGHz5`iTF1F+$x>P>m_iGkwkbQ$9F7SNRV_OEIW~%&|mc$~pID-yygzQ}`iW}ZFazukg39yD?7XKUj*E@9IIw3rA
zz-8{M9Zt$GhXqet6jrG>53x2s5Nd@{!UvlLCa6znMMz4ob-G>E@+!8*oWk{&mWqSJ
z*l*^(7O3a9i)N61e{~<)HqTw{bZPaTa-A;D)Fp>pv%4(X)uUf$G`Y(@hz`=_4nHs
z5Q}Yt4Bi?3Gh)=ecpBDrZFB6)LjMRs-K?q5?p(y(SehR2$@@F~A<6S0A*AJMg>Eh|
z$ADVYH*h9ar+b=~e3z{o!$qne*BgiOMgmY7W>(WV3w)G*TMY>Bxm0so)xvR@hwXzx(w{F%3Dj|G2zhms)o$gSxWl?Sw46N5V<
zaW3I}eWpj)$W(I_w8hQe_V;<5Vxbe3>0N#~a*&3K&1)xxfqVPx5fqFWQqsC_Fs=kC
zD%v#Nh^d?c%NvofG2V0LiEN5(!dVeBblRs(TII?MKQ1OI8+j}DJqk(lB0)4#JDT-+dUj3w4
ymqo1n>JX#%CiInWUfHq!ft9Vw9dNgy3UQI;RssLsFGBg?RD3)GJX*>0oPPjA`zQGT
delta 507
zcmew?w4XzF!Z*FYl
zJmet4_MkmQK{4T}R9L1_^VF#cPuaxGqIP!lb|_mkBv&+wIEn;!R6YFt@OjXlXOCrB
z*3HQEyWC;n_CI80yIgVimC_phs~T(~66j!t{o$VWrpRS+L9gSJyZ9Z#-hPi-XZzhU
zZy9$d-->g&#^)72Zdj;e@cGK8vp&pL&kN3;npZ6RUlQFMAb&=9=Dk_@D{nJKtSe_^
ZV-UP7B>q07ZUN9I44$rjF6*2UngFtzo>Kq-
diff --git a/app/src/main/res/drawable-hdpi/actions_cent.png b/app/src/main/res/drawable-hdpi/actions_cent.png
index 02b6df9c4ffb82b0422d08162bc859292e063913..1d6649995637ab2ca5b9fa50d9307795743bf582 100644
GIT binary patch
delta 1804
zcmZ{lYdqA68pn}F4PzFK7)JhsMX51Yw~!g+Hr8qsHpi@6G2>DREoc51JFd&5+QE_<
z8I;@59utaL_X%NE4Y^ECpEB(@RJJH}cFv3Q*;jo&&-47=e1G4!&z$yKeV{NX@Hh;L
zgsQ2j!F+u@gH;*xzuf~--ISGUw99~vI{LC-sTKZkv^^GUP9hz_5{M)c*3KMfkHul^
zRYN+AB{&mF&Nv6*C$zdY$=v2td{Rtu`UTr7<{GBv1hO{~i^USjWSlC!yc``VcnY3G
z!4k0^WQslc%IUu$(ifo$4g3F_@Lz;h|27f62wCnTgG#HXnQCggU;27_&@$$g5#KRs
zA^R5VLaxfGS+M(XwEYEGz0gu5)aE72P=%M
zkZd?#uygFv-GlT!;lhyb8ilV$MJLzIdjEy5dGgO{m(EiiGo-bE%*U_X-Y;EvH|KI~
zEN1W=0nB~aZ`i)K8a}CR(jO*|mCt_YtdlRx+vHzu8Em;`=pTieL9`;wm=X_)VJ<_A
zkX%yl`)~Y4_W1)_HO4sOV)2CBn`r4b#Z7A0R^ExFI4&M-_Fhnoy01P-7&mcVo6Q3p
za@Xi4juX>OSvm{59%#Nhbq6T!Pn3VXq3;U;k7Ot3y7VXC9^yh!QzzR4%L@r2gN4@g
zWMk*K@l36Zu+MYNjb-ZoT{?V0X?EcDg(aZdQ0f0*33d
z;^Io8uO|qP9-)Mb%la!{40(;ysNr?jJ4Ej`g*#o!#4Yzp_WPnPl3_RCkW57s5Hh{;@oG2+j*0OYRO~c_i;@p{KwC|0$Hi&C%;^T&3
z%65il??hV>tP-=-O}!rQEj0s%gBL1c|$KU8#l8SSKR{l;rF4R1jU
zdit{Xr>|a6QCFVddS!{&Pw@Ky^%|ANd0XBXUi%T9=R{lB?w;8!(geYRE+O$MhCDxB
z;^WbBpynXCw3t_zRG{0-u^U4GT~)?Hx-h|gj0+P`nKCXz^5G=k-7b2gpF)}Vyyu>H
zya1s+%P!_LO*u17@myPKkyesP2RS14E*8a&;2Jfe#i9h-z_5$|iTm?Crf;1X5jEg4
z_stF`^_L^UXDv$Wv|EQ+n;(g_qG-{>%|cVuXN)p5wbv%Yu4;J|SA(YT0%T>9kZ|_f
zxo?G<1?}P)r2n7YhquvrtDP>bK2xsKC0Tmp&`W}p%a2zpeowJmzB}j)2D(tYg4UbQ
zr-6rPD`jV%w8&WP^q=8n9=y{lWtfb~O>NUhFYt9ic_rY19naf6wX~};_>#qm)QnED
zWE$X-CH&-#TZ%C3^>XyQ67g|k#99(4y~_;h;U~Q0&A8{aJd;H$bfsOEru*9b25LP_
z$n6J)c~P#OMP7}t2(Y71&U!t+Z6p{jNC*io3USgdP&N$)lj{VR{!wz<`+og{_65XZ
z+aQB~R`8q@eLsPQJGizv_H|J}q_A$*Ok{UH@?IQGANcI^y}^+5#gGWna;-uy513;>
zE$SOM6RXobO-p{uHjNQt^-t@KL-`|ts7!O~>D&bY%Al^4)B3)NJZQwYvX&O+;gkjqU68@8+O&bDpqSh&zX$D^VtX!8z
vuKel{tN%9awO>B>c>lo4R^<-3+enSH$a1TI|KJ~~dT?sKUV)yiWP0vjhGHkS
delta 920
zcmew?bdy`LGr-TCmrII^fq{Y7)59eQNZSCh0S6n9^tF@ZoT#Y5C^6BiPt`y-*}%*|
z!OT$4(AdP-#7IZM$iUD*-@s7c&_LJF!pgwR%EWl%UnNFH)5%&)GBM^ZmS*ObP8LSS
zZq9~=uErL|rpC@jj?QithQ=-~F2+g<6}bhzzE&>z$)&lec_p4Mwn{(|y_C!pE2v&e
zTzV%jVlsePV1`SPl0tDwP->c03T_L`ap|3`$Lv%e`}Now1_q{ZPZ!6Kid%1H`eq0R
z3LKy8+abVY8mM?lWUIz3v84;XT}Za~yVn(Nc)?ll>mnABmU%2Ik4%oRnX=8vf2m3P
z7o`Y|j@;%25lkmNmrS{$vB)up!{d+tjFt@|$=iNkiY;fWONlI-{&#PGWxm-vuceQQ
zf_At@v;a{(gaVN_0xG`$Zs@%+=ie382`sl2c&{BW`jN<*=zGvOzsc_ce_mr{00Z}f
zQ~%X!xMFTU-oqcmsyTsu@*RzB;``WbeAjU{Tl`>&Yp~nR72JO`YRA39iyz8Xu)4ib
zlX<={TZQeQ_lHL5gUO{2C(l{)P5OD|jLQZ4nXT&AXw_VN61VW>#DtG6Gda)cJajeS
z@lq@IVE=B?dA{Lt*sR0aa|(^Qmd$GyPMUV~d{k=Wsm9X}RxX+oEPP%C`k}?GV^NJ|dHDxKc6f76opddnz2?P^gRWlv$4++$Hx*r2
z^{gmNrfgQhrOZS8Z#DKTi;wa+JnyKb$WexR^Gz9#44zH;}gd$*WBu+CDC
z&VL|K>-Osq)0RrfN3U{z>u+D%d_DBxrRPcK{0{x|_;5n5)FL!p(BOcw!rI->s`nl|
zb-zyZjY`a!cTZ-Y$$#W{_?CC?gjM4FpVDV>bZ-Eo4~<9V8QB;@lUH!u_3bSLW;O;-
LS3j3^P6H#wSONw^qmc-BoClFa
za3Ir2R1Ykv?9AT~?Tb*khW-Cd(V8bq%~#HZHHdj5s0e)7*M=Z@3u)5JC3w8yVp-!EQ#H|uK}ueL9{~6*iv_jVHQh*
zkX}~r{cp@h#)Si0)y7!k0?D|-gJ9)7SrXr-y?Q5#;<#|E$zxtQ;rt8e_dZ794^c|p}FHZ6GhQ1dBJerY^<=mHWd$0t8nmpC!SDJ?x8_c()
zB;?_(cE_uSX`c1G#578WtZL%Cu-T8G-IAGrYB}6h_{cHSqVQf-3O(nxTxUvznie^+
zMi5M`EvF##Oz{sWR!-4EqiunY@p@*bPngHEzpog8M$dlW5olIAqpvW%T#9
z7>yQCxnGQagyGO|<4f&H{IGlz$VZOQY=eUu7E08j*eG{a{
zCPmui(G&MDSQv3*3&w_kwghr=x$(`6hlkNuk$|r!Qy5mQ+z%C>Sh67LTfd==B;za@
z{!d>P{PfieI;!mXtyflv{dn&WP}+zr+QaI`(Atj{*(ApNcGvV~z9tCfc8UmB(d4h6Nk5ztxYvVIsP_1l-EjT$=K+Wr^4_OYZyNatjUp-f_I
zcN3rsxwvxz0Mz!?>eQ)VIXQCwIOoY#Ds+%BBRVR?w;teE>Q3A!g7b`J5>ybD%jH!$
z7*|PbVB5ngQw$QzR+aRS*hp2lBj41jx{z}twyJKG0I;TOolVT*nc`4YlJif0yQF>5
z2x$6|Gjul>wW(kyE1zr2ERze^Hg-Nm7};$6arwKx<%8yIHcKhb}_NB6E1Lc{x=
zXTRCuCH-<#^sIT+I{DTS&gMr#jW|O5a5K*o^%=byl+eS+w{&;F3G{QOclxh4
zT}TEGGnR|bK53S7+L%AXi{1HWmW$D;6Pwzmk6z$v{j&?f13T2)-8GD>a`>X<$)wZ{
zvUCb4Axi}b8@H6fnCqn$bE}At8^hL8KiOTjf43m^C4bs2yZMfK-C
zZbEK5FvJgcq2|*XV4+}puY&V>ZreyWlp7lukRM3W&RuOB2q4!AFaM+Pw#WUt2W|6+
zh1LO<;GFO|G2(tK1AAy~bM)(c-!M__jG5T(LfE}%hCcAw^Lv9q*^5Cjr1@I8UN$hx
zf?C$q^Tt=Ex*He0muwnBCF-Bn8wPWR{ZMJ<)>B#YLX<&kH3;v%Qhi6=(s780dK=`Q
zPzh};*~Ll}Rmc|tV~6S$hI^lF1_$No>`-QX*>@OEM1Opbk|FmhZJ6a12X$QH1KY!K
z&Y?mBHZ^2;vMB=E?CN{yw>jMEd$(&_x0K%C>V33tY!Z|Oc7F2
zuxYjtRWS*cHXvc6f~ge#vUirl;8I<*&d_VETc)=BOD1Bybbmntv~NOl{nhVD_VGY~
z?qhT4tTgc3;zW{~9C*uGB
delta 1108
zcmew?G?`biGr-TCmrII^fq{Y7)59eQNZSIj6$cxTWKItZoT#Y5C^6BiPt`y-*}%*|
z!OT$4(AdP-#7IZM$iUD*-@s7c&_LJF!pgwR%EWl%UnNFH)5%&)GBE}&hEC?jCeB92
zZsvxDuErLoPNo*-rluz5POiqLu8v9y6}bhzzE&>z$)&lec_p4Mwn{(|y_C!pE2v%<
zTzV%jVlseP;D}3+l0tDwP->c03T_LWaOs__$Lv&p{LEq>U?2#3x;TbZ+YTgR%XC*zwB?scahHNMmrfD#I;pvQPSL4M&8tCP
z5#It5{kRC#POmwlqDud7aP?pST5rCM>ZGYoD_Il6?Cz<7hFXEl1bMH?!Vf
z2zTVS^!p$r#mHURBDZb!g39=Xl?AW&Iek7CpQ~$*9vY?Dzu-sXWnkUwUg$os$b{4dWxb>{^oT~
z@r=6KY1M02+uA<-#d~Y|<2QQGZ|!AS`&7-;*!P@my`${8uVycDWWJOKe+~R}XYay?
z<^B%(27Bf=+-v@4xS#j<*>Z>84F7tzsV9W@N$Ndwzo2~KWr0$5gO~%m9OHbUH|lZU
z{t1^)UVLpqft`S6r1HZD3ktW_XDe*_DBJY5OXZp8*^``=Iky=fsOetnH?cDMawGae
z@TU~9T=p#%3nK%wocB*upDo#Rw2%9Lb{+Gp*RS?kKe;%Uhe1BDbL~uvf-fgGPc7WL
zmhraogKaN^!+PavQUtcKSGm5rX%)4Nv*tX*2g4V2Qs=pXKGmINFtOS(b*W-g=i+)z
zK9#P@W<8^=o;_kOESFU-o4T!-**(nCNQPg06T{vlfnP>18gpOVG>JP@lETW@x=sAT
zD&3q%M`p4_ZEbmAk|tUr`{nAfEcM2)Ofi8^Vzq7`^hLw&N^LpQyqjhFDYxf&zZcwI
zuxsVJGb~^HqwfCYeEvn~xBbGGnRlW(7r0L1tZ#dheIZ%xpE}dIM+H{JD~yjY`>u{z
zKH+Ytjqk&fXUvcL8;qEH^?&v`ZJnI(`hh`F_qkWPe#u)>xT?~8#IG%y{%2B>ve4gW
zV%_tT+m|gk?d-e%#444IcCEjZq~~@@HuH&oiT{3mr*)5ro{imWb
z7bvytS~%T!<;4jrS6Z#H3;4Zs;d0gY?}IcqnZECP{pr-EcpLEqhV&B?z5Y+Uq5~`_
O7(8A5T-G@yGywoq@7KEk
diff --git a/app/src/main/res/drawable-hdpi/actions_feedback.png b/app/src/main/res/drawable-hdpi/actions_feedback.png
index f47cfa141f02a53b3f74688f5e2cc90aad789767..9c882377929f5cf40d3326f4964531d309114a7c 100644
GIT binary patch
delta 1804
zcmZ{lYdqA68pn}F4P!zhhLJy7l$!gvCC!E0#<3cO%`xj1W?U+v<;)*r$90iv2TN*X
zP;Nu#m{82RPYAPW$YpZ+lxaCswkSC}=f&A~eLm0g{N8+j-?z_)eed;wJU`!4FennL
zrltn-^q~2xGU9)`2co)(OE(x-0ULFTt6oKi@JGWjSgbjTbPP)%l1NxPa~uYXLt|7!
zI*KJY5lK!sd(jsQb#0Ql&Dogvh=i0&w%5!xOwEZn5(z^hxKk)NA{OiBM#hk7G%AgZ
zcgNV{sqU0(=l+6-n6E-*8kql^XkUev|1uHWz6x3GqJYs8**j`#yI*_K$c)t4m5}e)
zjDY>~H38U)cdc$#ypy$iYz28}9Y0Bb#=G00<`5RGub4Ak51MmKzD&Wr4oL>(_5Ec=
zhmc&jK)8MK%KgL4J;9=Y@9ITwhQ(*r%)0-DuX^^6O6T^oZBwLGpR}iMPJCRr^kK&N
z#z;i}1p=7$xYw|CZzX(O-J~~25viE|)Lx@lRJ17eZ5nL4r0O4snnAQe%-B*g)i8@C
zK}fHt_xv|zJ>%lR%_?J@ae-t^;ZC&jnkb2H)n2(5Np+Y%-snE39ClrP7CUO=c0JPkaP}Th&>N@tW?kPC0v^jq$a3yYxI0h+K~0=#^)1aKhz;hN
zQxftBR=eZXLp9HPTxJ@jLsm5Lp1ABM&@Rcef0Z15LiofX)1vS}WePp#u3TqQgqjjL
zv4#;$txcyu^mOqLC{|9c_HqYQd*&CNFPhYito$4cC$>p1sgeh1006R^*$=E~?F
zZLu278fkrmh~`etLuJVR@r)GZP;U#s=cbJnmY!@{IJ2r@{}OTG{Gx^Dt*91=OJv;B
zI)Ca`Dy@60B_CFfUg)Ghj0x5o2Q%%xGk1?rP8;$kLh*PFb>du8#m{lW|5hMnI7}m?
z+9pNX>E0dpI7k?NYZJzXfVMwgu
z8ZRb;M;J@R=btsnIjzi};l*VBxus%s>iCAX>62IZ8o%s9@ZdJ>ZdWzqx*Wb>c{(Yz
zog$qCN+?o6!ulO$5cX!N#q0{=^ZJmr)K_+&?bjuUea)Y8&2D-j4_E5SI;>3hw|Mnc
zlT9eC2M76KF0_2NdRPe9)}!FOo!v4L4(7%N_~!>WYUi#r^!rn4gjfDvc-Q@5?W5K?
z#C%IXOAsx5NeX`$%fKC8-5B{M-zQX5Gi@feyBPW)ilGneczka#AbT|+hBVzM)5`{C
zSWwH_I^NjwWLLw2*P=~*h(!I%TKz!IkS{9D+n@;!~{&g0=GS?1E_b9y<*3Upi<+PH6!TmiL1QlzJlrfcB1SuD$s!2@?pn%-0IY!{;3KcB#k4JQ_fMpo%I9@F2QEVcDjhRy`9#8hF|=txpifsjhO^DU8#^m&
xiqNHh+DGcY4|?mBQ*x@eZ)vl98{BQAMw;iGD1-mt9jbb8YMySsv}Ou3>rXMWDD40M
delta 1595
zcmZ{ldoUMs`zXLE1I%obv3!g1;H&Pt@jDr0IcEzuH9ZoO$F
zmy{wTG>S%fLo2y0N%b<(mP<<=dcEiLZ+|?`bI#{H-{<@N@0nl!Ro5iL&&ORGVTgc0
zAljZDRL1HguNDcezS_48#5~F|!Kop0c4lD#%W%LBK-+;wEpfw0s
zf(}lAofDBzyNpp&vlVWGZVm&ej`nsth=2`Yhdl_=2oAOsTL*hvTcSOMMzE#1V$hr;
z$LMq?YE1ZvBL|Ki_oR|AtHg>G$#VLo1%Ia%mO_DF1_avgmN01camImzPORS=5O(}d
zE3{fe;hEQ-ltUn}1y8E$ZqCSuP#!BFR^Mf`xCH(YIcameF4pFn0PcxcQgqffD3JP{P^%DQPibcIMNV>a*%$yyA1bb5d)(
zf~yk$SeDI`CfU8q;?{wI0EE;>>vZgo%2eK$;$8ntF&7d^llRy^2;$--M0%C0OGGY!
zK#~NT1ei9SgBGk(&E>C|S6_|8lOkqDW?(Ybs|QKt9=q7(3HR3fX+Rl;Me4q&Q_4KL
zTf0w_IH=_r=Q-|;w-FHYZP`#_FA<0BA)C=c=0;b5-7AUv9lCmu#>h=5)scl{-a)@>*AvI*9wc*QV~RLE5+Op|l`tyT=9f
z{A8%s>6XT}v@dzJ+M}AvGcA$5Dq*ao950IFH1tFaoSO+43alNsxxNvk+{a2{C7G5m
z;)G8{-7M}*Z={vjc$gAW-N6(0uNRdrXS=eD$szboF{+dQM|Auob4-Iqu6ssvdSnC=sip8lUirtU3O}Bd%dFfm
z(Wna~j~`%~QWiZGp6KbmB}+yejqJRi$>^OPW2b%j6P{6|3EdW}qI>7xlX4}f`>8kk
z>#!pIc&jMR-?^*kG+`w5R^L4n^l+~gVS7zbcd(q)qs+vH!lz#37H#sMZ|-@*9T6=*
zRfigizIsRN@M^9dQyLBE8D7`E>kY@*S1QYf9J6FK+&=w!$S|3#CuHp4Jqjoc9FoN?L`R^&&BkoyL
znm%-%lDy5`UE5;&o*pm7l1VFO0Y(KmFA=^`3349kd~Qe9QC*m$c<$band4mrpw@ZzN$;n}NKLnI`THfLIp<(NWDeb(q
zCF43Act~?z{@8o2^XNM0Gd{zVXq8o7(8gGen~_q`M2Asn?1_qRVIOB7mgZtLEUoif
zu)w#3y3V;LXasewIsHbhTYV$OD{6^y`|&5LU%dpA3W+m87xwl_+sqw|`FTNoa~8_e
zTJr2@Gf|ipabQ|=X(5o*9{q^-1BGb1I@_i1(aW>WoE23nFRgRTJ7PvwCCiC#@3?lx
zR4mTUyk%9%!SQrA7m>kpfm6De?DA}1U12gMB=n33j!P9qN~&KPUc+j&3i0<_%TxMp
z`l>WX6+qk7;>A<6U}wI9FOdaim4(7#3hQhUw2&5CFs=4sUkuqU_k}KY)1Be5f^){i*)}JXP0t
diff --git a/app/src/main/res/drawable-hdpi/actions_order.png b/app/src/main/res/drawable-hdpi/actions_order.png
index 065ec3d1dfcb4975f3e1aef0e4184b600d1ffd73..902f8d66e47bac0c4b4fb9f26a3aedccaa4e1174 100644
GIT binary patch
delta 1804
zcmZ{lYdqA68pn}F4PzFK7)JhRQEF~x+(L69x3N~EusLSkiW!$mXgTx8*l}H?+QE_<
z8I;@59utaL_X%NE4Y^E?PnmWcDqEB~JLkpu?5jSX=Xri_zQ6C=XGQz1K9C>ae*y+Y
zLeAY(i9G>P6eD<{GBv1cD=hO0vh1$v6TQ>*3)@#8I8d
zP9%&Il}Mye30Kej4dK5Cm1|)BZ^C>LTK(IE{UT(wiwxdECGgbLcE9wdlIUr3%CPTP
z^q_qUwL#d*H*FqP+~ak7Z29?UodEGb=9^pL<`5>ezl1&00GhK+K25`Y4vL3l4Flyy
z2ay~&U$Arh^1VZhJ)y#&?;3=!MntF9&3gWYuYUT^DwmGa?bF0Hzw{@s+}9xb2w&`~R2lDEpg+A`R3P18RHHG^n{nXx1!ieWZW
zjF4Pb@BMG=M&^YBTh+!m<3jPc+>>DCGg+F@rmegiO>tZ}*5o;_7;#^H8aHO*yf%{q
zIApIeOdQ9j8Z&g}cRkd6cls_+*cUJVdPCnE0v^pw%y#KZyfat|K~0`&^DoP{7a7dA
zq$cLuTkTFz57#{Fb%|k=0a0q=y>U5@q21z{z-k%XP4L(;%cAIhRVpp_j!b7th?*8U
zGe-~%tu5zZ^i0VQC}wW)LZfY=ukm_Tr*Ax8D?`mRNnBbd{|MNfw}PE13xS*EUzC8M
zy6l*kqR1O@!ed7%q2iLhiWh?(V{}?*?TvQPyG`Lvr!s!aeS-78pp$6W1vq5YaHO>N
zwpfi8jr4x|sFp7F14Y=riOf{Ra9=CHM)iy;WFR_uq0PApkC>07_?7)ilf
z(gU8oEd1%K7c|t>mD{hZ5c}lV(@Bw2G^?pz!=;C6b^}
z&fD2nTw1&)U8jmN^vJ=N1xZ()td{?tWVdv0z!~&+p>+nV
zH(f{p57U=R&OU9HvD+9w!%IlKGs`9Dw24h^)5kCHwE;Or;DH_Lo$ea?H5q)-@?>&a
z2U#)&l#(U<#EsjE5bTXIi#a9Y#u%K#v}lN
zx=+xx0CVs#_|PYNDSeyN^Aqug;#ob{kwe#jO2!RaKM?Vs3~gEw=#w>0kt{Rt`e)_3
xJbd|AhiLt`A+LRMOHcImFK<=sfV+*pt_fyUv4spF;I-k3|`HA@tj%mIT6AGRmKOp_OL*Zm&?1!^fI_0vOA{X+%G_jYy
zOZ;}rX2v>4KlT|Ll^5T$WV@a4_>-WorvFEaR3Rh1IU8maPWXCLEw{9H*M~z7>$lI^
zvhjzNi{jIrnY=o;48FE~zScjXb;|Rl2bXl49Zq1k*>~j|U(I$VWzXhryEzByn;2)i
zs4vpf;0v0=dskmUv^{B(o}K5>r4uYX3nwXQLeV0Rt|cJkRgt-a{dWb^HQU@hpA0JI
zFa2=-g`j`*E&r~zez1aiu(}uGZ{I$dsvW!L`{|#exqBWj+erfGC`zsR{JyeETS^iDu=ZWI9SG8w%FRhGiHRmzE
zU-Z|~ntNRc^JIRd)^3hX-y;4M#W`4Q$nA^$uvBx(AyI`G-cR+{rcOJ+!h1evJI}fU
zH})PZpZeeGK~oQ3|A~-A$G+N`^NPFkNM4WSJ}@_)Vg8!O|8`rpc2BZvaDPxcRk`4B
z)#lq%uW`<83rz_T&K1;YR8P3H`LK=Aub7wdTlZ>oaaaEc;cCC67Qt8?DE`^Mfsr9U
Ys#5Fn?S&J8`HsQU)z4)evr|G70GH>4;Q#;t
diff --git a/app/src/main/res/drawable-hdpi/actions_weibo.png b/app/src/main/res/drawable-hdpi/actions_weibo.png
index 402d9b731e97400c9e66480263e90da52200ee03..4b4dbaab4baafc692eb9dd1ad3c0c8597bea66fa 100644
GIT binary patch
delta 1804
zcmZ{le>~HPAIFiV#w;{3CLeStHT&sT$Tsq8zD`rPoSk3A=0_!TeD}fJ{5+((;Ydw}
z!i>IWq1gGo5O!+h$8tT&x;ZLWl=|Mje|#VJSC7a0{eJ!Pd_DhtH|=?=4-^Cj9EU-X
zP&G9*n2$FlNR`q5+g%XVOVE-^YO?SkzUa}85-f}@j@C&`IGB4G&_jHjm)f#5~L
zIZ*Ie9D(9!PrP#aABgxxs6xa3|0diQp_PA3_%A|MJ4m2F8|I>>w)3SA#edb7HD&6|?|7j3?$jNis4qeO)w;e91U!~Nt#&4=M`)h$zDPI9geWy}KG@tx&~EWeP>l@k#((6PZBcx$I*polTc$H5L`@5w
z86ya~)~0g^dZzSy6eF)>p~<$$&v-4n(=UOim8oW$EH0~;e+2B#S;0=1hr-PYE=a&I
zT~=&tan$vA;n5@HFmY*L<%>bjF&Z_j?s~iE-G*?xQ<<>oKEZxp*hw_(0vxhy*;49z
zTZ~4lMn*qAy0wdSUlG1{A}dWX+$R9I?2Pf^@?$NFCs#Ebo+HkkS+elC5i5YW#w0v$
z2qJH#Q+mb)g|JHWVi)y(T$tVjnC;+~y>paw!jL-|fx~I26Xsj0eo7emU5=Du?VBOB
zHffSBubza5q5P;Dn=mE>v?Y*ID~xYuJv@ZIiUj<<>HLTq#XhL$_>zT_zV#c=kyM-|
zE%52fq96CXprWokzxB!ru@CS20qQv-jrFp+F|_)FMXnQVeyeMGqfiqB^E-uvt7y{P
zSh2T9%l?{!q>>_TL1Mmc565m40d!Uw3+cjm_t7#KpURY#F(e;O^4#sB*89lh@z1;N
ziO2F0+B57TPBV@gIqcjE9HN%WgwshQP-#Dmoc{Gor}bJY+}i$Uz4oz`WJu>^nW0o{
zYvr|2XT-R>*abaU(h^#J>UHR_RXMD1mc~rD9YFmd)l=
zI~Z4sZD3o&DpMR1%T$&0kl1Kdcp%@@sk)G}Betq;H4m_+YMn{W;h5r3)#7tcf4!)E
z!3b#nfi-kDAGIN8rYfFmOD$82Gw2{k#NNRoyWw3UhqYMb02>%);m_E=-lKch2;q_a
zF0=pI=A`_5MEI;lX`OoOFl*x@p;iE%*%`oxB|>7y68y1?9GaQ`;tc6Tl9stmqpc_Jmf
zgCv;(%19Dk()uk$DCT;(#heoHaedfY5+J?H4D9B`zvNE4=e9hPMJaTpomQrM1-|{Y
z9wwx={X^VHS4yF0BP<+j@0GJ&&utm;hw|ftg9?M4wDXls13{!Z{-tk=Z+qRZf6z9M
zSP%>_cxU;~iBb3CY1o6S8>3$p`bP-sX3Ru(=OgaL()5AP-rpGvN?#0$AT8G_^m2h&
z2Gp{?fiu1`)!nq{yJXWCE>{1v);O3q9DvF&x1P$G=c5b+H6XnEa?KreOUEH1>TO71
zQWdnRYzHG*SSecwjvs1}8}5F#5gJmUvrV4$XWpSb5&rQVN{ZaAu%TB}9?)@33~rCa
zxrFl#n3S;L$>u0%i<|$!U*~Yj`3_j7clnjb0U9bcugxP2+}mr9AY;st($;+gaV1D`
z(T3T2Oywk4-iU;a@}|B?Xz-C
x937|t%=MKV;5t|GK-n9jTmEVvJHboXRKLbVvNwyL}RN-jggSGLMmI9
zBxNVALNu0Z3vo$yvR(K3aqmw*zVAEdJ@0d#f8T~!iKt?-y{#os2qFXk0D#t3c;eAD
zIvSY3iKA^}EG5WNRO6ClT}V-ZX?erYFaLN515HL7Q2L{)H!?fUf1~9aN
zF0%4(B`z)$TZ3E19fn84^!0W15J(FQ9Bz)(L*Y<*7!*nugEL2>%uSUPB7?8n*cjj`
z-n3xfkZ@}}R_Q3w_6hJY_>a{;j%7dPhW#%$y?CL_=
zX}iD91+<dVjI@9+ZN5zk(NpAv1v}
zIXl1h$~V>d?215_d*-GCg`MX}KEgQ)p;B0&pRUD%0A`FD!)Ujxpw|xy-Xdr$moIN!
zsN+AA|3Q6wACdb6V8qj>-+gDLd0u>RO`gR7$0V!~f#E4T=q_K6rsV0*YOpz6gHh-h
zosVQH96jmUAoDgTvPJ_d6)PCctXD==_<15D-s3dKn_tmD(xel2YekFe`BhtP-hE6+
zt8z(L=8YR4Tzxq~cdcU>x)DI5p0Tc*x#M_n>m`W_X>PC6CxrlFG1m|-5C({#J+Y=u9jMReHH}TlOKpX-`
zU7z-F$TLiTmTCY7Wm5Smv+0nV9f#+$pLHY1!3DJN%Z}++_@L?|{bSy(h(5D0A&6Wo
z=_$jb`Ng}XFM~X{ohWTs&U@1}%DPNYTq0Az;v)%Yg)Jg^?_>#t_iPbb$tn+}qJNZj
z!qi{VKN(eDivX|eK{HO03B3;|kZpdk*Xp4V8lZO9-?$meKM2KltoBtcTLksk$l5Pf
z*2>Iuq+44&hHp!scAGSeV$85PzvUa1vekxtVxxzA@_vmvV&-z|{>kWE%Mxpiv2zZF
zyna5NBsnxl3^%uNOHOp|>A(MNp{iud_-q-S@Z$E(6lw7k=*N(sQlJmnm`g(Lt*v)v
z-V&w{m5PiF8#d?uj_zcAq4t`Dc(t8kvKlA7=+axgNf%!rTwS?Vk_O*=E-3u2?8P8f
zwye;MMpVoGB&vTX4Hzkj1%|~XW6610-5<$pdDxs4NH!XHwO>OpIZLKpRYdArYtL8u
z`u!wd)ylp;%k~!U*J|X9OrqA9vs))(Dq-=?gnF=VoJ6=;-S2pQ&6<)foGYippM==h
z&tMhCx&W1dXGaGtTLwu_3%ammke3zn73X_={Af{$ilv{nM%z*o92GCKGq32FTDq3u
zrrC(7PSy7tf-CM?*=1kmSS+o^Y154*TnA1+IH+xz{RRf-X~=1;&7