|
@@ -1021,7 +1021,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
|
|
|
|
|
|
|
|
content_data_control = translateChange(content_data_download,changed_data);
|
|
content_data_control = translateChange(content_data_download,changed_data);
|
|
|
|
|
|
|
|
- if (!refresh) {
|
|
|
|
|
|
|
+ if (refresh) {
|
|
|
|
|
|
|
|
if (restore_json != null) {
|
|
if (restore_json != null) {
|
|
|
int rc = restore_json.optInt("count");
|
|
int rc = restore_json.optInt("count");
|
|
@@ -2501,10 +2501,14 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
|
|
|
if (type.toLowerCase().equals("date")) {
|
|
if (type.toLowerCase().equals("date")) {
|
|
|
pickerMode = 0; // Date
|
|
pickerMode = 0; // Date
|
|
|
dateFormatter.applyPattern("MM/dd/yyyy");
|
|
dateFormatter.applyPattern("MM/dd/yyyy");
|
|
|
-
|
|
|
|
|
- Date date = dateFormatter.parse(value);
|
|
|
|
|
final Calendar c = Calendar.getInstance();
|
|
final Calendar c = Calendar.getInstance();
|
|
|
- c.setTime(date);
|
|
|
|
|
|
|
+ if(!TextUtils.isEmpty(value))
|
|
|
|
|
+ {
|
|
|
|
|
+ Date date = dateFormatter.parse(value);
|
|
|
|
|
+ c.setTime(date);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
new DatePickerDialog(CommonEditorActivity.this,
|
|
new DatePickerDialog(CommonEditorActivity.this,
|
|
|
new DatePickerDialog.OnDateSetListener()
|
|
new DatePickerDialog.OnDateSetListener()
|
|
|
{
|
|
{
|
|
@@ -2544,7 +2548,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
pickerMode = 2; // date and time
|
|
pickerMode = 2; // date and time
|
|
|
- dateFormatter.applyPattern("yyyy/MM/dd HH:mm:ss");
|
|
|
|
|
|
|
+ dateFormatter.applyPattern("MM/dd/yyyy HH:mm:ss");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Date date = dateFormatter.parse(value);
|
|
// Date date = dateFormatter.parse(value);
|