fix:
update:优化离线添加闹钟,优化离线添加联系人,dock栏自定义图标
This commit is contained in:
2024-08-27 15:10:55 +08:00
parent 251b6a3329
commit 7f134d6328
40 changed files with 1328 additions and 447 deletions

View File

@@ -242,7 +242,7 @@ public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.holder> {
@Override
public void onClick(View view) {
Intent intent = new Intent(mContext, AlarmEditActivity.class);
intent.putExtra("id", alarmClockData.getId());
intent.putExtra("AlarmClockData", alarmClockData);
mContext.startActivity(intent);
}
});

View File

@@ -28,10 +28,10 @@ public class AlarmClockData implements Serializable {
String voice_md5;
String file;//图片或视频文件地址
String file_md5;
int remind_type;
int remind_type; //提醒方式 1仅震动
int is_onoff;//0关闭 1开启
@SerializedName("class")
int clazz;
int clazz;//分类 1吃药 2接送 3预约
boolean finished = false;
boolean is_local = false;

View File

@@ -331,33 +331,7 @@ public class AlarmUtils {
* @return 获取单个闹钟
*/
public AlarmClockData getDatabaseSingleAlarm(AlarmClockData data) {
List<AlarmClockData> list = new ArrayList<>();
String selectQuery = "SELECT * FROM " + AlarmOpenHelper.TABLE_ALARM + " where id =" + data.getId();
Cursor cursor = mDatabase.rawQuery(selectQuery, null);
if (cursor.moveToFirst()) {
do {
AlarmClockData alarmClockData = new AlarmClockData();
alarmClockData.setId(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_ID)));
alarmClockData.setType(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_TYPE)));
alarmClockData.setTime(cursor.getString(cursor.getColumnIndex(AlarmOpenHelper.KEY_TIME)));
alarmClockData.setTitle(cursor.getString(cursor.getColumnIndex(AlarmOpenHelper.KEY_TITLE)));
alarmClockData.setVoice(cursor.getString(cursor.getColumnIndex(AlarmOpenHelper.KEY_VOICE)));
alarmClockData.setVoice_md5(cursor.getString(cursor.getColumnIndex(AlarmOpenHelper.KEY_VOICE_MD5)));
alarmClockData.setFile(cursor.getString(cursor.getColumnIndex(AlarmOpenHelper.KEY_FILE)));
alarmClockData.setFile_md5(cursor.getString(cursor.getColumnIndex(AlarmOpenHelper.KEY_FILE_MD5)));
alarmClockData.setRemind_type(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_REMIND_TYPE)));
alarmClockData.setIs_onoff(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_IS_ONOFF)));
alarmClockData.setClazz(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_CLAZZ)));
alarmClockData.setFinished(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_FINISHED)) == 1);
alarmClockData.setIs_local(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_IS_LOCAL)) == 1);
alarmClockData.setEdited(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_EDITED)) == 1);
alarmClockData.setDeleted(cursor.getInt(cursor.getColumnIndex(AlarmOpenHelper.KEY_DELETED)) == 1);
list.add(alarmClockData);
} while (cursor.moveToNext());
}
cursor.close();
return list.size() == 0 ? null : list.get(0);
return getDatabaseSingleAlarm(data.getId());
}
public AlarmClockData getDatabaseSingleAlarm(int id) {