From c4e2f11922ea351c5138276a0df2c9a19185c94e Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 14 Sep 2022 22:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=92=9F=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../activity/alarm/AlarmClockActivity.java | 13 ++++- .../java/com/uiui/aios/alarm/AlarmUtils.java | 2 + .../com/uiui/aios/bean/UserAvatarInfo.java | 44 ++++++++++++++++ .../uiui/aios/fragment/CustomFragment.java | 49 ++++++++++++++++++ .../aios/network/NetInterfaceManager.java | 9 ++++ .../com/uiui/aios/network/URLAddress.java | 2 + .../aios/network/api/UserInfoControl.java | 19 +++++++ .../uiui/aios/service/main/MainService.java | 2 +- app/src/main/res/drawable-hdpi/back.png | Bin 29218 -> 0 bytes app/src/main/res/drawable-hdpi/back_black.png | Bin 0 -> 2989 bytes app/src/main/res/drawable-hdpi/back_white.png | Bin 0 -> 2837 bytes .../main/res/layout-land/activity_applist.xml | 2 +- .../main/res/layout-land/activity_weather.xml | 2 +- .../main/res/layout-land/fragment_custom.xml | 11 ++++ .../main/res/layout-land/fragment_second.xml | 32 ++++++------ .../main/res/layout-port/activity_applist.xml | 2 +- .../main/res/layout-port/activity_weather.xml | 2 +- .../main/res/layout/activity_alarm_clock.xml | 38 +++++++++++++- 19 files changed, 208 insertions(+), 25 deletions(-) create mode 100644 app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java create mode 100644 app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java delete mode 100644 app/src/main/res/drawable-hdpi/back.png create mode 100644 app/src/main/res/drawable-hdpi/back_black.png create mode 100644 app/src/main/res/drawable-hdpi/back_white.png diff --git a/app/build.gradle b/app/build.gradle index f402b98..8c4b5ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 22 - versionName "3.1" + versionCode 23 + versionName "3.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java b/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java index ac26efe..1104b27 100644 --- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java @@ -1,5 +1,8 @@ package com.uiui.aios.activity.alarm; +import android.view.View; +import android.widget.ImageView; + import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -20,6 +23,9 @@ public class AlarmClockActivity extends BaseActivity implements AlarmClockContac @BindView(R.id.recyclerView) RecyclerView recyclerView; + @BindView(R.id.iv_back) + ImageView iv_back; + private AlarmClockPresenter mPresenter; private AlarmAdapter mAlarmAdapter; @@ -39,7 +45,12 @@ public class AlarmClockActivity extends BaseActivity implements AlarmClockContac mAlarmAdapter = new AlarmAdapter(); recyclerView.setLayoutManager(new LinearLayoutManager(AlarmClockActivity.this)); recyclerView.setAdapter(mAlarmAdapter); - + iv_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); } @Override diff --git a/app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java b/app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java index 78fefcf..8e8caac 100644 --- a/app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java +++ b/app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java @@ -584,6 +584,8 @@ public class AlarmUtils { timestamp += (8 - day_of_week) * AlarmManager.INTERVAL_DAY; break; default: + timestamp += (6 - day_of_week) * AlarmManager.INTERVAL_DAY; + break; } Intent intent = new Intent(action); intent.putExtra("title", extra); diff --git a/app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java b/app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java new file mode 100644 index 0000000..b538052 --- /dev/null +++ b/app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java @@ -0,0 +1,44 @@ +package com.uiui.aios.bean; + +import java.io.Serializable; + +public class UserAvatarInfo implements Serializable { + private static final long serialVersionUID = 7700643058775210597L; + + String username; + String avatar; + String gread; + int id; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getGread() { + return gread; + } + + public void setGread(String gread) { + this.gread = gread; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } +} diff --git a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java index c493612..4f9b6ab 100644 --- a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java @@ -30,6 +30,7 @@ import android.widget.TextView; import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationListener; import com.blankj.utilcode.util.NetworkUtils; +import com.bumptech.glide.Glide; import com.google.gson.Gson; import com.qweather.sdk.bean.base.Code; import com.qweather.sdk.bean.base.Lang; @@ -48,8 +49,10 @@ import com.uiui.aios.adapter.NotificationAdapter; import com.uiui.aios.adapter.SOSNnmberAdapter; import com.uiui.aios.bean.AlarmClockData; import com.uiui.aios.bean.AlarmItem; +import com.uiui.aios.bean.BaseResponse; import com.uiui.aios.bean.HealthCode; import com.uiui.aios.bean.SnInfo; +import com.uiui.aios.bean.UserAvatarInfo; import com.uiui.aios.dialog.SingleDialog; import com.uiui.aios.manager.AmapManager; import com.uiui.aios.alarm.AlarmUtils; @@ -67,6 +70,9 @@ 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; /** @@ -112,6 +118,8 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt RecyclerView rv_sos; @BindView(R.id.iv_note_nodata) ImageView iv_note_nodata; + @BindView(R.id.iv_head) + ImageView iv_head; @BindView(R.id.cl_health) ConstraintLayout mClHealth; @@ -121,6 +129,8 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt ConstraintLayout mClFace; @BindView(R.id.cl_hand) ConstraintLayout mClHand; + @BindView(R.id.tv_name) + TextView tv_name; private String TAG = CustomFragment.class.getSimpleName(); // private int[] mShaderColors = new int[]{0xFFfa3db5, 0xFFF8867E, 0xFFF79F6B, 0xFFF79F6B, 0xFFF79F6B, 0xFFF8867E, 0xFFfa3db5}; @@ -418,6 +428,45 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt } private void initData() { + NetInterfaceManager.getInstance().getSnInfo(new NetInterfaceManager.SnInfoCallback() { + @Override + public void setSnInfo(SnInfo snInfo) { + if (snInfo != null) { + if (TextUtils.isEmpty(snInfo.getSn_name())) { + tv_name.setText("未设置"); + } else { + tv_name.setText(snInfo.getSn_name()); + } + } else { + tv_name.setText("未设置"); + } + } + }); + NetInterfaceManager.getInstance().getUserAvatarInfoControl() + .subscribe(new Observer>() { + @Override + public void onSubscribe(@NonNull Disposable d) { + Log.e("getUserAvatarInfoControl", "onSubscribe: "); + } + + @Override + public void onNext(@NonNull BaseResponse userAvatarInfoBaseResponse) { + Log.e("getUserAvatarInfoControl", "onNext: " + userAvatarInfoBaseResponse); + if (userAvatarInfoBaseResponse.code == 200) { + Glide.with(iv_head).load(userAvatarInfoBaseResponse.data.getAvatar()).into(iv_head); + } + } + + @Override + public void onError(@NonNull Throwable e) { + Log.e("getUserAvatarInfoControl", "onError: " + e.getMessage()); + } + + @Override + public void onComplete() { + Log.e("getUserAvatarInfoControl", "onComplete: "); + } + }); initAmap(); getAlarmClock(); } 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 f057f51..bc37c14 100644 --- a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java @@ -21,6 +21,7 @@ import com.uiui.aios.bean.HealthCode; import com.uiui.aios.bean.NetDesktopIcon; import com.uiui.aios.bean.SnInfo; import com.uiui.aios.bean.SystemSettings; +import com.uiui.aios.bean.UserAvatarInfo; import com.uiui.aios.bean.UserId; import com.uiui.aios.disklrucache.CacheHelper; import com.uiui.aios.manager.ConnectManager; @@ -41,6 +42,7 @@ import com.uiui.aios.network.api.SendScreenshotApi; import com.uiui.aios.network.api.Setting; import com.uiui.aios.network.api.UpdateAlarmClockApi; import com.uiui.aios.network.api.UpdateDesktopApi; +import com.uiui.aios.network.api.UserInfoControl; import com.uiui.aios.network.interceptor.RepeatRequestInterceptor; import com.uiui.aios.utils.GsonUtils; import com.uiui.aios.utils.Utils; @@ -164,6 +166,13 @@ public class NetInterfaceManager { .observeOn(AndroidSchedulers.mainThread()); } + public Observable> getUserAvatarInfoControl() { + return mRetrofit.create(UserInfoControl.class) + .getUserAvatarInfo(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + public Observable>> getAlarmClockObservable() { return mRetrofit .create(AlarmClockApi.class) diff --git a/app/src/main/java/com/uiui/aios/network/URLAddress.java b/app/src/main/java/com/uiui/aios/network/URLAddress.java index 11bb55e..2d19589 100644 --- a/app/src/main/java/com/uiui/aios/network/URLAddress.java +++ b/app/src/main/java/com/uiui/aios/network/URLAddress.java @@ -4,6 +4,8 @@ public class URLAddress { public static final String ROOT_URL = "https://led.zuoyepad.com/android/"; /*设备信息接口*/ public static final String SNINFO = "sn/getSnInfo"; + /*获取用户头像和信息*/ + public static final String GET_USER_AVATAR_INFO = "sn/getUserAvatarInfo"; /*获取闹钟*/ public static final String GET_ALARM_CLOCK = "getAlarmClock"; /*应用使用记录*/ diff --git a/app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java b/app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java new file mode 100644 index 0000000..316594e --- /dev/null +++ b/app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java @@ -0,0 +1,19 @@ +package com.uiui.aios.network.api; + + +import com.uiui.aios.bean.BaseResponse; +import com.uiui.aios.bean.UserAvatarInfo; +import com.uiui.aios.network.URLAddress; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; + +public interface UserInfoControl { + @FormUrlEncoded + @POST(URLAddress.GET_USER_AVATAR_INFO) + Observable> getUserAvatarInfo( + @Field("sn") String sn + ); +} diff --git a/app/src/main/java/com/uiui/aios/service/main/MainService.java b/app/src/main/java/com/uiui/aios/service/main/MainService.java index d00b6ae..708aae8 100644 --- a/app/src/main/java/com/uiui/aios/service/main/MainService.java +++ b/app/src/main/java/com/uiui/aios/service/main/MainService.java @@ -168,7 +168,7 @@ public class MainService extends BaseService implements MainSContact.MainSView, break; case AlarmUtils.WORKING_DAY: if (day_of_week < 5 || day_of_week == 7) { - AlarmUtils.getInstance().setDayLoopAlarm(MainService.ALARMWAKEUP, alarmClockData.getTitle(), alarmClockData.getId(), alarmClockData.getTime()); + AlarmUtils.getInstance().setWorkDayAlarm(MainService.ALARMWAKEUP, alarmClockData.getTitle(), alarmClockData.getId(), alarmClockData.getTime()); } break; case AlarmUtils.OFF_DAY: diff --git a/app/src/main/res/drawable-hdpi/back.png b/app/src/main/res/drawable-hdpi/back.png deleted file mode 100644 index 1118b60cbca180553a20073b9aaa7d8e1eabb8e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29218 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 Gt@sZi?&h5U literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout-land/activity_applist.xml b/app/src/main/res/layout-land/activity_applist.xml index 6231c52..fafea65 100644 --- a/app/src/main/res/layout-land/activity_applist.xml +++ b/app/src/main/res/layout-land/activity_applist.xml @@ -19,7 +19,7 @@ android:layout_marginStart="8dp" android:adjustViewBounds="true" android:scaleType="centerCrop" - android:src="@drawable/back" + android:src="@drawable/back_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-land/activity_weather.xml b/app/src/main/res/layout-land/activity_weather.xml index 99ce23b..fd3af79 100644 --- a/app/src/main/res/layout-land/activity_weather.xml +++ b/app/src/main/res/layout-land/activity_weather.xml @@ -17,7 +17,7 @@ android:adjustViewBounds="true" android:layout_marginStart="8dp" android:scaleType="centerCrop" - android:src="@drawable/back" + android:src="@drawable/back_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml index 48a5a07..fe5c47c 100644 --- a/app/src/main/res/layout-land/fragment_custom.xml +++ b/app/src/main/res/layout-land/fragment_custom.xml @@ -104,6 +104,7 @@ app:layout_constraintTop_toTopOf="parent" /> + + + android:orientation="horizontal"> + android:layout_height="match_parent" + android:layout_weight="1"> @@ -170,9 +170,16 @@ + + + - - - @@ -389,6 +390,7 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout-port/activity_applist.xml b/app/src/main/res/layout-port/activity_applist.xml index 6231c52..fafea65 100644 --- a/app/src/main/res/layout-port/activity_applist.xml +++ b/app/src/main/res/layout-port/activity_applist.xml @@ -19,7 +19,7 @@ android:layout_marginStart="8dp" android:adjustViewBounds="true" android:scaleType="centerCrop" - android:src="@drawable/back" + android:src="@drawable/back_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-port/activity_weather.xml b/app/src/main/res/layout-port/activity_weather.xml index 99ce23b..fd3af79 100644 --- a/app/src/main/res/layout-port/activity_weather.xml +++ b/app/src/main/res/layout-port/activity_weather.xml @@ -17,7 +17,7 @@ android:adjustViewBounds="true" android:layout_marginStart="8dp" android:scaleType="centerCrop" - android:src="@drawable/back" + android:src="@drawable/back_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/activity_alarm_clock.xml b/app/src/main/res/layout/activity_alarm_clock.xml index ecd47fb..211262c 100644 --- a/app/src/main/res/layout/activity_alarm_clock.xml +++ b/app/src/main/res/layout/activity_alarm_clock.xml @@ -7,8 +7,44 @@ tools:context=".activity.alarm.AlarmClockActivity"> + android:layout_height="32dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + +