Skip to content

Commit 7d501fa

Browse files
committed
-재생시 정보표시 단순하게 수정
-버전업
1 parent ce9a698 commit 7d501fa

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

Source/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "com.ksi.alltv"
77
minSdkVersion 23
88
targetSdkVersion 26
9-
versionCode 7
10-
versionName "1.7"
9+
versionCode 8
10+
versionName "1.8"
1111
}
1212
buildTypes {
1313
release {

Source/app/src/main/java/com/ksi/alltv/PlayerActivity.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,7 @@ private void hideProgramInfo() {
320320
private void displayProgramInfo() {
321321

322322
try {
323-
String stime = getResources().getString(R.string.noinfo_str);
324-
String etime = getResources().getString(R.string.noinfo_str);
325-
String name = getResources().getString(R.string.noinfo_str);
323+
String stime = "", etime = "", name = "", finalText = getResources().getString(R.string.noinfo_str);
326324

327325
if (!mInfoArray.get(mInfoIndex).getAsJsonObject().get(getResources().getString(R.string.STIME_STR)).isJsonNull())
328326
stime = mInfoArray.get(mInfoIndex).getAsJsonObject().get(getResources().getString(R.string.STIME_STR)).getAsString();
@@ -334,13 +332,12 @@ private void displayProgramInfo() {
334332
name = mInfoArray.get(mInfoIndex).getAsJsonObject().get(getResources().getString(R.string.NAME_STR)).getAsString();
335333

336334

337-
if (!stime.equals(getResources().getString(R.string.noinfo_str)))
335+
if (stime != null && stime.length() > 0 && etime != null && etime.length() > 0 && name != null && name.length() > 0) {
338336
stime = stime.substring(8, 10) + ":" + stime.substring(10, 12);
339-
340-
if (!etime.equals(getResources().getString(R.string.noinfo_str)))
341337
etime = etime.substring(8, 10) + ":" + etime.substring(10, 12);
338+
finalText = stime + " ~ " + etime + "\n" + name + "\n";
339+
}
342340

343-
String finalText = stime + " ~ " + etime + "\n" + name + "\n";
344341
infoView.setText(finalText);
345342
} catch (Exception ex) {
346343
infoView.setText(getResources().getString(R.string.noinfo_str));

Source/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"PatchedVersion" : "1.7"
2+
"PatchedVersion" : "1.8"
33
}

0 commit comments

Comments
 (0)