Merge remote-tracking branch 'GitLab/master'

This commit is contained in:
2022-09-05 11:49:34 +08:00
17 changed files with 720 additions and 358 deletions

View File

@@ -49,7 +49,7 @@ import com.uiui.aios.adapter.SOSNnmberAdapter;
import com.uiui.aios.bean.AlarmClockData;
import com.uiui.aios.bean.AlarmItem;
import com.uiui.aios.manager.AmapManager;
import com.uiui.aios.utils.AlarmUtils;
import com.uiui.aios.alarm.AlarmUtils;
import com.uiui.aios.utils.ApkUtils;
import com.uiui.aios.utils.AppUtil;
import com.uiui.aios.utils.SchemeUtils;
@@ -442,7 +442,10 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
String jsonString = mmkv.decodeString("AlarmClock", "");
if (!TextUtils.isEmpty(jsonString)) {
List<AlarmClockData> data = new ArrayList<>();
data.add(AlarmUtils.getInstance().getRecentAlarmClock());
AlarmClockData alarmClockData = AlarmUtils.getInstance().getRecentAlarmClock();
if (alarmClockData!=null){
data.add(alarmClockData);
}
notificationAdapter.setDataList(data);
rv_noti.setVisibility(View.VISIBLE);
iv_note_nodata.setVisibility(View.GONE);