Переглянути джерело

1. FAQ 상세화면 수정.

aaron 8 роки тому
батько
коміт
1b88ffa954

+ 1 - 0
onecable/src/main/java/com/ntels/onecable/common/Constants.java

@@ -518,6 +518,7 @@ public interface Constants {
   String EXTRA_MEMBER_ID = "member_id";
   String EXTRA_CONDITION_TYPE = "condition_type";
   String EXTRA_FAQ_ID = "faq_id";
+  String EXTRA_FAQ_TITLE = "faq_title";
   String EXTRA_FAQ_SOURCE = "faq_source";
   String SEND_TYPE_GET = "GET";
   String SEND_TYPE_DELETE = "DELETE";

+ 1 - 0
onecable/src/main/java/com/ntels/onecable/view/mainmore/Faq.java

@@ -447,6 +447,7 @@ public class Faq extends CustomActivity implements View.OnClickListener, CustomD
             // FAQ 상세보기
             mIntent = new Intent(this, FaqDetail.class);
             mIntent.putExtra(Constants.EXTRA_FAQ_ID, mUtil.null2string(mTotalList.get(position).get(Constants.KEY_FAQ_ID)));
+            mIntent.putExtra(Constants.EXTRA_FAQ_TITLE, mUtil.null2string(mTotalList.get(position).get(Constants.KEY_TITLE)));
             mUtil.callActivityForResult(mAct, mIntent, Constants.ACT_FAQ_DETAIL);
         } else {
 

+ 6 - 0
onecable/src/main/java/com/ntels/onecable/view/mainmore/FaqDetail.java

@@ -33,6 +33,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.WebView;
+import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -73,7 +74,9 @@ public class FaqDetail extends CustomActivity implements View.OnClickListener, C
     private int mListColumnsCnt = 1;
     private boolean mIsMore = true;
 //    private String mFaqSource;
+    private String mFaqTitleStr;
     private String mFaqId;
+    @BindView(R.id.tvFaqTitle) TextView mFaqTitle;
     @BindView(R.id.wvFaqDetail) WebView mFaqWebView;
 
     @Override
@@ -91,6 +94,8 @@ public class FaqDetail extends CustomActivity implements View.OnClickListener, C
 
         if (null != getIntent()) {
             mFaqId = getIntent().getStringExtra(Constants.EXTRA_FAQ_ID);
+            mFaqTitleStr = getIntent().getStringExtra(Constants.EXTRA_FAQ_TITLE);
+            Dlog.i("mFaqId = " + mFaqId + ", mFaqTitle = " + mFaqTitleStr);
         }
 
         setToolbar();
@@ -122,6 +127,7 @@ public class FaqDetail extends CustomActivity implements View.OnClickListener, C
     private void displayListView() {
 
         mUtil.getView(mAct, R.id.llBtn1).setOnClickListener(this);
+        mFaqTitle.setText(mFaqTitleStr);
 
         mSwipeRefreshLayout = (SwipeRefreshLayout) mAct.findViewById(R.id.swiperefreshlayout);
         mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_red_light,

+ 36 - 4
onecable/src/main/res/layout/faq_detail.xml

@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                >
+        >
 
             <android.support.v4.widget.SwipeRefreshLayout
                     android:id="@+id/swiperefreshlayout"
@@ -32,10 +32,42 @@
                     android:layout_weight="1"
                     android:visibility="visible">
 
-                <WebView
-                        android:id="@+id/wvFaqDetail"
+                <com.ntels.onecable.common.widget.CustomScrollView
+                        android:overScrollMode="never"
+                        android:id="@+id/svBody"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:fadingEdge="none">
+
+                    <LinearLayout
+                            android:id="@+id/llSvbody"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+                        <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingLeft="15dp"
+                                android:paddingRight="15dp"
+                                android:paddingTop="20dp"
+                                android:paddingBottom="20dp">
+                            <TextView
+                                    android:id="@+id/tvFaqTitle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    style="@style/setting_title_text"/>
+                        </LinearLayout>
+                        <View
+                                style="@style/width_Divider_01"/>
+                        <WebView
+                                android:id="@+id/wvFaqDetail"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"/>
+                    </LinearLayout>
+                </com.ntels.onecable.common.widget.CustomScrollView>
             </android.support.v4.widget.SwipeRefreshLayout>
 
             <LinearLayout