shjung hai 1 ano
pai
achega
29e141ea42

BIN=BIN
app-release-1.6.apk


+ 2 - 2
app/build.gradle

@@ -20,8 +20,8 @@ android {
         targetSdkVersion 30
 //        versionCode 13
 //        versionName "1.3"
-        versionCode 15
-        versionName "1.5"
+        versionCode 16
+        versionName "1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

BIN=BIN
app/release/app-release.apk → app/release/app-release-1.6.apk


+ 2 - 2
app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 15,
-      "versionName": "1.5",
+      "versionCode": 16,
+      "versionName": "1.6",
       "outputFile": "app-release.apk"
     }
   ]

+ 10 - 0
app/src/main/java/com/tsi/navi/activity/fragment/DirectionNaviSignalFragment.java

@@ -316,6 +316,7 @@ public class DirectionNaviSignalFragment extends Fragment {
         boolean isBlink = false;
         remainSeconds = this.signalCurr.getRemainTime(TsiUtils.SIGNAL_STRAIGHT);
         lightStatus = this.signalCurr.getLightStatus(TsiUtils.SIGNAL_STRAIGHT);
+        Log.e(TAG, "SIGNAL_STRAIGHT: " + remainSeconds + ", " + lightStatus);
         switch (lightStatus) {
             case 0: // light out
                 break;
@@ -340,8 +341,16 @@ public class DirectionNaviSignalFragment extends Fragment {
                 this.sigIdx[3] = 1;
                 isBlink = true;
                 break;
+            case 7: // u-turn
+                // 20221017
+                // 국가산단01, 직진신호에 U-Turn 상태로 들어옴
+                break;
         }
         lightStatus = this.signalCurr.getLightStatus(TsiUtils.SIGNAL_LEFT_TURN);
+        if (remainSeconds < 0) {
+            remainSeconds = this.signalCurr.getRemainTime(TsiUtils.SIGNAL_LEFT_TURN);
+        }
+        Log.e(TAG, "SIGNAL_LEFT_TURN: " + this.signalCurr.getRemainTime(TsiUtils.SIGNAL_LEFT_TURN) + ", " + lightStatus);
         switch (lightStatus) {
             case 0: // light out
                 break;
@@ -387,6 +396,7 @@ public class DirectionNaviSignalFragment extends Fragment {
             this.sigIdx[0] = 0;
             this.sigIdx[1] = 0;
         }
+        Log.e(TAG, "remainSeconds: " + remainSeconds);
         if (remainSeconds < 0) remainSeconds = 255;
         this.tvCycle.setText(" " +String.valueOf(remainSeconds));
         for (int ii = 0; ii < this.MAX_SIGNAL; ii++) {