diff --git a/app/build.gradle b/app/build.gradle index d8e2e6e..ba64424 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 53 - versionName "6.2" + versionCode 54 + versionName "6.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6070f49..a4ccb22 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -88,6 +88,7 @@ android:resizeableActivity="true" android:resumeWhilePausing="true" android:stateNotNeeded="true" + android:configChanges="orientation|screenSize|keyboardHidden" android:taskAffinity="com.example.taskaffinity.newtask" android:windowSoftInputMode="adjustPan"> diff --git a/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java b/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java index ac5e732..78fb312 100644 --- a/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java +++ b/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java @@ -134,7 +134,7 @@ public class CustomPresenter implements CustomContact.Presenter { @Override public void getAlarmClock() { - NetInterfaceManager.getInstance().getAlarmClock(new NetInterfaceManager.AlarmClockCallback() { + NetInterfaceManager.getInstance().getAlarmClockFragment(lifecycle, new NetInterfaceManager.AlarmClockCallback() { @Override public void setAlarmClock(List alarmClockList) { AlarmClockData alarmClockData = AlarmUtils.getInstance().getRecentAlarmClock(); diff --git a/app/src/main/java/com/uiui/aios/manager/AmapManager.java b/app/src/main/java/com/uiui/aios/manager/AmapManager.java index 5e8cc74..95dd435 100644 --- a/app/src/main/java/com/uiui/aios/manager/AmapManager.java +++ b/app/src/main/java/com/uiui/aios/manager/AmapManager.java @@ -8,6 +8,7 @@ import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; +import com.blankj.utilcode.util.SPUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; @@ -97,7 +98,7 @@ public class AmapManager { public AMapLocation getNowAMapLocation() { if (nowAMapLocation == null) { - String aMapLocationjson = mMMKV.decodeString(AMAPLOCATION_JSON_KEY, ""); + String aMapLocationjson = SPUtils.getInstance().getString(AMAPLOCATION_JSON_KEY, ""); Type type = new TypeToken() { }.getType(); AMapLocation aMapLocation = new Gson().fromJson(aMapLocationjson, type); @@ -116,12 +117,12 @@ public class AmapManager { Log.d(TAG, "onLocationChanged: " + aMapLocation.toStr()); if (aMapLocation.getErrorCode() == 0) { nowAMapLocation = aMapLocation; - mMMKV.encode(AMAPLOCATION_JSON_KEY, aMapLocation.toStr()); + SPUtils.getInstance().put(AMAPLOCATION_JSON_KEY, aMapLocation.toStr()); mMMKV.encode(LONGITUDE_KEY, String.valueOf(aMapLocation.getLongitude())); mMMKV.encode(LATITUDE_KEY, String.valueOf(aMapLocation.getLatitude())); mMMKV.encode(ADDRESS_KEY, aMapLocation.getAddress()); } else { - mMMKV.encode(AMAPLOCATION_JSON_KEY, ""); + SPUtils.getInstance().put(AMAPLOCATION_JSON_KEY, ""); } aMapLocationListener.onLocationChanged(aMapLocation); } diff --git a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java index e82121d..906207d 100644 --- a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java @@ -725,6 +725,12 @@ public class NetInterfaceManager { .subscribe(getAlarmClockObserver(callback)); } + public void getAlarmClockFragment(BehaviorSubject lifecycle, AlarmClockCallback callback) { + getAlarmClockObservable() + .compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY)) + .subscribe(getAlarmClockObserver(callback)); + } + public void getAlarmClock(AlarmClockCallback callback) { getAlarmClockObservable() .subscribe(getAlarmClockObserver(callback)); diff --git a/app/src/main/res/drawable-hdpi/font_size.png b/app/src/main/res/drawable-hdpi/font_size.png index eac86f3..84e2d3f 100644 Binary files a/app/src/main/res/drawable-hdpi/font_size.png and b/app/src/main/res/drawable-hdpi/font_size.png differ diff --git a/app/src/main/res/drawable/shape_thumb_icon.xml b/app/src/main/res/drawable/shape_thumb_icon.xml index 925c488..1620744 100644 --- a/app/src/main/res/drawable/shape_thumb_icon.xml +++ b/app/src/main/res/drawable/shape_thumb_icon.xml @@ -5,6 +5,9 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_control.xml b/app/src/main/res/layout-land/fragment_control.xml index 2f2d5b8..0329166 100644 --- a/app/src/main/res/layout-land/fragment_control.xml +++ b/app/src/main/res/layout-land/fragment_control.xml @@ -7,7 +7,6 @@ android:background="@drawable/control_background" tools:context=".fragment.ControlFragment"> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.32" /> + app:layout_constraintVertical_bias="0.2" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.32" /> + app:layout_constraintVertical_bias="0.2" /> @@ -180,7 +179,6 @@ android:layout_weight="1" android:background="@drawable/control_background_item"> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView" + app:layout_constraintTop_toBottomOf="@+id/seekBar"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.32" /> + app:layout_constraintVertical_bias="0.2" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.32" /> + app:layout_constraintVertical_bias="0.2" /> diff --git a/app/src/main/res/layout-land/item_weather.xml b/app/src/main/res/layout-land/item_weather.xml index ba1ad16..db8cef0 100644 --- a/app/src/main/res/layout-land/item_weather.xml +++ b/app/src/main/res/layout-land/item_weather.xml @@ -29,7 +29,7 @@ android:maxLines="1" android:singleLine="true" android:text="17:48" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintBottom_toTopOf="@+id/iv_weather" app:layout_constraintEnd_toEndOf="parent" @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:text="15-22" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-port/fragment_control.xml b/app/src/main/res/layout-port/fragment_control.xml index baf5b88..0962e1e 100644 --- a/app/src/main/res/layout-port/fragment_control.xml +++ b/app/src/main/res/layout-port/fragment_control.xml @@ -10,6 +10,7 @@ + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> @@ -93,24 +94,24 @@ android:id="@+id/tv_wifi" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_28" android:text="WIFI" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_17" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.25" + app:layout_constraintHorizontal_bias="0.2" app:layout_constraintStart_toEndOf="@+id/iv_wifi" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> @@ -147,24 +148,24 @@ android:id="@+id/tv_bt" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_28" android:text="蓝牙" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_17" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.25" + app:layout_constraintHorizontal_bias="0.2" app:layout_constraintStart_toEndOf="@+id/iv_bt" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> @@ -193,24 +194,24 @@ android:id="@+id/tv_battery" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_28" android:text="电量" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_17" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.25" + app:layout_constraintHorizontal_bias="0.2" app:layout_constraintStart_toEndOf="@+id/iv_battery" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> @@ -323,11 +324,8 @@ + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView4" + app:layout_constraintTop_toBottomOf="@+id/seekBar"> @@ -53,7 +53,7 @@ android:id="@+id/tv_weather" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:text="15-22" android:layout_marginTop="@dimen/dp_8" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintEnd_toEndOf="@+id/iv_weather" app:layout_constraintStart_toStartOf="@+id/iv_weather"