Преглед изворни кода

[주모]
- 약관 주소 변경
- 서브타이틀 치환 임시 수정

yeongyun пре 6 година
родитељ
комит
16bd0a7575

+ 6 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/view/ListicleImageView.java

@@ -121,6 +121,12 @@ public class ListicleImageView extends ConstraintLayout {
 
     textViewTitleNumber.setText(StringUtil.lpad(2, index));
     textViewTitle.setText(title);
+
+    //TODO: 서브타이틀 입력 오류로 콤마로 끝나는 서브타이틀 콤마 제거
+    if(subTitle.endsWith(",")) {
+      subTitle = subTitle.substring(0, subTitle.length()-1);
+    }
+
     textViewSubTitle.setText(subTitle);
 
     contentsLength = contentsDetailImageBeans.size();

+ 8 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainCategoryContentsImageView.java

@@ -315,7 +315,14 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
 
     textBig.setText(bean.getTwoLineTitle());
     textBig.measure(0, 0);  // 이후 높이를 가져올 수 있다.
-    textSmall.setText(bean.getSubTitleWithTrim());
+
+    //TODO: 서브타이틀 입력 오류로 콤마로 끝나는 서브타이틀 콤마 제거
+    String subtitle = bean.getSubTitleWithTrim();
+    if(subtitle.endsWith(",")) {
+      subtitle = subtitle.substring(0, subtitle.length()-1);
+    }
+    textSmall.setText(subtitle);
+//    textSmall.setText(bean.getSubTitleWithTrim());
 
     maskWidth = ResourceUtil.getDimension(R.dimen.main_contents_image_width);
     int maskHeight = ResourceUtil.getDimension(R.dimen.main_contents_image_height);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/zumo/activity/TermsAndAgreeActivity.java

@@ -39,10 +39,10 @@ public class TermsAndAgreeActivity extends AppCompatActivity {
         boolean type = getIntent().getBooleanExtra(TYPE_PRIVACY_TERMS, true);
         if (type) { // 상세 약관
             ((TextView) findViewById(R.id.action_bar_title)).setText(getString(R.string.title_terms1));
-            ((WebView) findViewById(R.id.webView)).loadUrl("http://www.zumo.co.kr/html/provision_new.html");
+            ((WebView) findViewById(R.id.webView)).loadUrl("https://ch.zumo.co.kr/resources/homepage/provisions/provision_new.html");
         } else {    // 개인정보 취급 방침
             ((TextView) findViewById(R.id.action_bar_title)).setText(getString(R.string.title_terms2));
-            ((WebView) findViewById(R.id.webView)).loadUrl("http://www.zumo.co.kr/html/privacy_policy_new.html");
+            ((WebView) findViewById(R.id.webView)).loadUrl("https://ch.zumo.co.kr/resources/homepage/provisions/privacy_policy_new.html");
         }
 
         findViewById(R.id.ib_close).setOnClickListener(view -> finish());