Merge branch 'kddi/odakyuToiletSignage_1.0.2_leej' into 'master'

Kddi/odakyu toilet signage 1.0.2 leej

See merge request !3

app/build.gradle

@@ -15,7 +15,7 @@ android {
         minSdkVersion 23
         minSdkVersion 23
         targetSdkVersion 26
         targetSdkVersion 26
         versionCode 1
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     }
     buildTypes {
     buildTypes {

app/src/main/java/jp/odakyu/toiletsignage/task/UpdateToiletInfoTask.java

@@ -112,7 +112,7 @@ public class UpdateToiletInfoTask extends TimerTask {
             JSONObject jsonObject = new JSONObject(jsonString);
             JSONObject jsonObject = new JSONObject(jsonString);
             Long ntpTimeMillis = (long) ((Double) jsonObject.get("st") * 1000);
             Long ntpTimeMillis = (long) ((Double) jsonObject.get("st") * 1000);
 
 
-            String cmd = "date " + DateTimeUtil.toString(new Timestamp(ntpTimeMillis), DateTimeFormat.MMDDHHmmyyyyss__colon);
+            String cmd = "date " + DateTimeUtil.toString(new Timestamp(ntpTimeMillis), DateTimeFormat.MMddHHmmyyyyss__colon);
 
 
             Logger.d(TAG,"Current Date : " + DateTimeUtil.toString(DateTimeUtil.getCurrentDate(), DateTimeFormat.yyyyMMddHHmmss_slash));
             Logger.d(TAG,"Current Date : " + DateTimeUtil.toString(DateTimeUtil.getCurrentDate(), DateTimeFormat.yyyyMMddHHmmss_slash));
             Logger.d(TAG, "Command=%s, NtpDate=%s", cmd, DateTimeUtil.toString(new Timestamp(ntpTimeMillis), DateTimeFormat.yyyyMMddHHmmss_slash));
             Logger.d(TAG, "Command=%s, NtpDate=%s", cmd, DateTimeUtil.toString(new Timestamp(ntpTimeMillis), DateTimeFormat.yyyyMMddHHmmss_slash));

app/src/main/java/jp/odakyu/toiletsignage/util/DateTimeFormat.java

@@ -265,8 +265,8 @@ public class DateTimeFormat {
 	 */
 	 */
 	public static final String HHmmssSSS_colon = "HH:mm:ss.SSS";
 	public static final String HHmmssSSS_colon = "HH:mm:ss.SSS";
 	/**
 	/**
-	 * 時間を示します。"MMDDHHmmyyyy.ss"
+	 * 時間を示します。"MMddHHmmyyyy.ss"
 	 * @since 1.0.0
 	 * @since 1.0.0
 	 */
 	 */
-	public static final String MMDDHHmmyyyyss__colon = "MMDDHHmmyyyy.ss";
+	public static final String MMddHHmmyyyyss__colon = "MMddHHmmyyyy.ss";
 }
 }