[提交人]：王雪伟

[提交简述] ：1.1.4
[实现方案] ：客服链接配置，加入客服电话

cms/src/main/java/com/zxhl/cms/common/Constant.java

@@ -143,6 +143,7 @@ public class Constant {
         public static boolean isBindLogin = true;
         public static boolean isOpenPayTips = true;
         public static boolean isOpenVip = false;
+        public static boolean isErrorKF = false;
     }
 
     public static class NewUserBox {

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -201,6 +201,7 @@ public class NetConfig {
         public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version=" + Constant.Param.vn + "&appName="+AppContext.get().getResources().getString(R.string.app_name)+"&company=北京掌心互联科技有限公司";
 
         public static String WEB_URL_CUSTOMER_SERVICE = "https://1568685.s4.udesk.cn/im_client/?web_plugin_id=35245";
+        public static String WEB_URL_CUSTOMER_SERVICE_ERROR = "https://h5.zhangxinzhixun.com/to_refund";
         public static String WEB_URL_ZENGZHI_SERVICE = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/xxsq_zz_server.html";
         public static String WEB_URL_BUYER_KNOW = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/buyerKnow.html?version=" + Constant.Param.vn + "&appName="+AppContext.get().getResources().getString(R.string.app_name)+"&company=北京掌心互联科技有限公司";
         public static String WEB_URL_WEEK_RULE = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/week_activity_rule.html";

cms/src/main/java/com/zxhl/cms/net/model/box/AppInEntity.kt

@@ -21,13 +21,14 @@ class AppInEntity {
     var tabs: List<TabEntity>? = null//tab
     var pay_h5_url: String = ""//支付配置
 
-    var mobileOpList:List<MobileOpEntity>?=null
+    var mobileOpList: List<MobileOpEntity>? = null
+    var switch: ServiceConfig? = null
 
 }
 
 class MobileOpEntity {
-    var name:String?=""
-    var value:String?=""
+    var name: String? = ""
+    var value: String? = ""
 }
 
 class PayFun : Serializable {
@@ -59,3 +60,7 @@ class BoxPriceConfig {
     var boxNum: Int = 0;
     var boxDiscount: Double = 0.0;
 }
+
+class ServiceConfig {
+    var customer_service_switch: Boolean = false
+}

cms/src/main/java/com/zxhl/cms/router/RounterApi.kt

@@ -34,7 +34,10 @@ interface RounterApi {
     ): Intent
 
     @RounterUri(Constant.scheme + "://udesk")
-    fun getIntentActivityUdesk(): Intent
+    fun getIntentActivityUdesk(
+        @RounterParam("title") title: String,
+        @RounterParam("url") url: String
+    ): Intent
 
     @RounterUri(Constant.scheme + "://h5")
     fun getIntentActivityH5(

cms/src/main/java/com/zxhl/cms/udesk/UdeskWebViewActivity.java

@@ -14,6 +14,7 @@ import android.webkit.SslErrorHandler;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.TextView;
 
 import com.zxhl.cms.R;
 import com.zxhl.cms.common.NetConfig;
@@ -28,6 +29,8 @@ import me.jessyan.autosize.utils.ScreenUtils;
 public class UdeskWebViewActivity extends Activity {
 
     private WebView mwebView;
+    private String title;
+    private String url;
     UdeskWebChromeClient udeskWebChromeClient;
 
     @Override
@@ -39,6 +42,7 @@ public class UdeskWebViewActivity extends Activity {
         if (statusBarHeight <= 0) {
             statusBarHeight = 40;
         }
+
         findViewById(R.id.id_sys_bar_view).getLayoutParams().height = statusBarHeight;
         findViewById(R.id.id_img_kefu_close).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -46,6 +50,14 @@ public class UdeskWebViewActivity extends Activity {
                 finish();
             }
         });
+        if (getIntent().getData() != null) {
+            title = getIntent().getData().getQueryParameter("title");
+            url = getIntent().getData().getQueryParameter("url");
+        }
+        if (!title.isEmpty()){
+            TextView titleView = findViewById(R.id.id_tv_web_title);
+            titleView.setText(title);
+        }
         initViews();
     }
 
@@ -58,7 +70,11 @@ public class UdeskWebViewActivity extends Activity {
                 }
             });
             mwebView = (WebView) findViewById(R.id.webview);
+            if (url.isEmpty()) {
                 settingWebView(NetConfig.H5.WEB_URL_CUSTOMER_SERVICE);
+            } else {
+                settingWebView(url);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

cms/src/main/java/com/zxhl/cms/utils/JumpUtils.java

@@ -354,9 +354,9 @@ public class JumpUtils {
         }
     }
 
-    public static void UDesk() {
+    public static void UDesk(String title,String url) {
         try {
-            Intent intent = RounterBus.getRounter(RounterApi.class).getIntentActivityUdesk();
+            Intent intent = RounterBus.getRounter(RounterApi.class).getIntentActivityUdesk(title,url);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             AppContext.get().startActivity(intent);
         } catch (Exception e) {

cms/src/main/res/layout/udesk_webview.xml

@@ -26,11 +26,12 @@
             android:src="@drawable/incon_back" />
 
         <TextView
+            android:id="@+id/id_tv_web_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center_horizontal"
-            android:text="客服"
+            android:text="在线客服"
             android:textColor="@color/color_333333"
             android:textSize="17sp"
             android:textStyle="bold" />

moduleMain/src/main/java/com/zxbw/modulemain/activity/RechargeActivity.kt

@@ -193,7 +193,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
             showToast("请输入要兑换的手机号")
             return
         }
-        if (phoneNumber.length < 11) {
+        if (phoneNumber.length != 11) {
             showToast("请检查要兑换的手机号")
             return
         }

moduleMain/src/main/java/com/zxbw/modulemain/activity/SplashActivity.kt

@@ -168,6 +168,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
                     Constant.Switch.isOpenLogin = result?.login.equals("1")
                     Constant.Switch.isOpenPayTips = result?.risk_open.equals("1")
                     NetConfig.H5.WEB_URL_H5_PAY = result?.pay_h5_url
+                    Constant.Switch.isErrorKF = result?.switch?.customer_service_switch?:false
                     SettingPreference.saveConfig(result)
                 }
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/UserQuestionActivity.kt

 package com.zxbw.modulemain.activity
 
+import android.content.Intent
+import android.content.Intent.ACTION_DIAL
+import android.net.Uri
 import android.text.Html
 import android.view.View
 import com.zxbw.modulemain.R
+import com.zxhl.cms.common.Constant
+import com.zxhl.cms.common.NetConfig
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.activity_layout_user_question.*
@@ -31,10 +36,12 @@ class UserQuestionActivity : BaseActivity() {
         id_ll_question_3.setOnClickListener(this)
         id_ll_question_4.setOnClickListener(this)
         id_ll_question_5.setOnClickListener(this)
+        id_ll_question_6.setOnClickListener(this)
+        id_tv_answer_6.setOnClickListener(this)
         id_ll_kefu.setOnClickListener(this)
         id_img_back.setOnClickListener(this)
-        id_tv_answer_5.text = Html.fromHtml(resources.getString(R.string.user_answer_5))
-        id_tv_answer_5.setOnClickListener(this)
+        id_tv_sqtk_btn.setOnClickListener(this)
+//        id_tv_answer_5.text = Html.fromHtml(resources.getString(R.string.user_answer_5))
     }
 
 
@@ -77,23 +84,39 @@ class UserQuestionActivity : BaseActivity() {
                 }
             }
             id_ll_question_5 -> {
-                if (id_tv_answer_5.visibility == View.VISIBLE) {
+                if (id_ll_answer_5.visibility == View.VISIBLE) {
                     id_check_question_5.isChecked = false
-                    id_tv_answer_5.visibility = View.GONE
+                    id_ll_answer_5.visibility = View.GONE
                 } else {
                     id_check_question_5.isChecked = true
-                    id_tv_answer_5.visibility = View.VISIBLE
+                    id_ll_answer_5.visibility = View.VISIBLE
+                }
+            }
+            id_ll_question_6 -> {
+                if (id_tv_answer_6.visibility == View.VISIBLE) {
+                    id_check_question_6.isChecked = false
+                    id_tv_answer_6.visibility = View.GONE
+                } else {
+                    id_check_question_6.isChecked = true
+                    id_tv_answer_6.visibility = View.VISIBLE
                 }
             }
             id_ll_kefu -> {
-                JumpUtils.UDesk()
+                if (Constant.Switch.isErrorKF){
+                    JumpUtils.UDesk("在线客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
+                }else{
+                    JumpUtils.UDesk("客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE_ERROR)
                 }
-            id_tv_answer_5 -> {
-               JumpUtils.webJump("申请退款","http://h5.zxhuichuan.com/xiaoxiang_refund")
+            }
+            id_tv_sqtk_btn -> {
+                JumpUtils.webJump("申请退款", "http://h5.zxhuichuan.com/xiaoxiang_refund")
             }
             id_img_back -> {
                 finish()
             }
+            id_tv_answer_6 -> {
+                startActivity(Intent(ACTION_DIAL,Uri.parse("tel:4000033616")))
+            }
         }
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/fragment/UserCenterFragment.kt

@@ -68,24 +68,28 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
             JumpUtils.PhoneVoucherJump()
         }
 
+        id_ll_zaixiankefu?.setOnClickListener {
+            JumpUtils.UserQuestion()
+        }
+
     }
 
-    private fun loadRewardAd(){
-        AdManager.loadRewardAd(activity!!,object :RewardVideoAdListener{
+    private fun loadRewardAd() {
+        AdManager.loadRewardAd(activity!!, object : RewardVideoAdListener {
             override fun onRewardVideoAdClose() {
-                Log.d("wxw","onRewardVideoAdClose")
+                Log.d("wxw", "onRewardVideoAdClose")
             }
 
             override fun onRewardVideoAdReward() {
-                Log.d("wxw","onRewardVideoAdReward")
+                Log.d("wxw", "onRewardVideoAdReward")
             }
 
             override fun onRewardVideoAdShow() {
-                Log.d("wxw","onRewardVideoAdShow")
+                Log.d("wxw", "onRewardVideoAdShow")
             }
 
             override fun onRewardVideoAdError(errorMsg: String?) {
-                Log.d("wxw","onRewardVideoAdError${errorMsg}")
+                Log.d("wxw", "onRewardVideoAdError${errorMsg}")
             }
         })
     }

moduleMain/src/main/res/layout/activity_layout_user_question.xml

@@ -71,9 +71,9 @@
                     android:id="@+id/id_check_question_1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:clickable="false"
                     android:background="@drawable/checkbox_style"
-                    android:button="@null" />
+                    android:button="@null"
+                    android:clickable="false" />
 
             </LinearLayout>
 
@@ -121,9 +121,9 @@
                     android:id="@+id/id_check_question_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:clickable="false"
                     android:background="@drawable/checkbox_style"
-                    android:button="@null" />
+                    android:button="@null"
+                    android:clickable="false" />
 
             </LinearLayout>
 
@@ -249,6 +249,56 @@
                 android:layout_marginRight="16dp"
                 android:background="#EFEFEF" />
 
+            <!--Q6-->
+            <LinearLayout
+                android:id="@+id/id_ll_question_6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:orientation="horizontal"
+                android:paddingTop="20dp"
+                android:paddingRight="20dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/user_question_6"
+                    android:textColor="@color/color_666666"
+                    android:textSize="16sp" />
+
+                <CheckBox
+                    android:id="@+id/id_check_question_6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/checkbox_style"
+                    android:button="@null"
+                    android:clickable="false" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/id_tv_answer_6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginRight="16dp"
+                android:background="@drawable/shape_f7f8fb_r10"
+                android:padding="10dp"
+                android:text="@string/user_answer_6"
+                android:textColor="@color/color_666666"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="16dp"
+                android:background="#EFEFEF" />
+
             <!--Q5-->
             <LinearLayout
                 android:id="@+id/id_ll_question_5"
@@ -277,20 +327,38 @@
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/id_tv_answer_5"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/id_ll_answer_5"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="14dp"
+                android:visibility="gone"
                 android:layout_marginRight="16dp"
                 android:background="@drawable/shape_f7f8fb_r10"
-                android:padding="10dp"
-                android:textIsSelectable="true"
+                android:orientation="vertical"
+                android:padding="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="@string/user_answer_5"
                     android:textColor="@color/color_666666"
-                android:textSize="14sp"
-                android:visibility="gone" />
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/id_tv_sqtk_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="7dp"
+                    android:background="@drawable/shape_edd49d_r5"
+                    android:paddingLeft="6dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="6dp"
+                    android:paddingBottom="3dp"
+                    android:text="申请退款"
+                    android:textSize="12sp" />
+            </LinearLayout>
 
         </LinearLayout>
 

moduleMain/src/main/res/layout/fragment_layout_user_center.xml

@@ -547,23 +547,23 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/id_ll_zaixiankefu"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="invisible">
+                android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="6dp"
-                    android:src="@drawable/icon_yonghuxieyi" />
+                    android:src="@drawable/icon_zaixiankefu" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="用户协议"
+                    android:text="在线客服"
                     android:textColor="@color/color_333333"
                     android:textSize="12sp" />
             </LinearLayout>

moduleMain/src/main/res/layout/view_navigation_bottom.xml

@@ -21,11 +21,11 @@
             android:drawableTop="@drawable/icon_bottom_shop_click"
             android:drawablePadding="2dp"
             android:gravity="center"
-            android:textStyle="bold"
             android:includeFontPadding="false"
             android:text="@string/bottom_vip"
             android:textColor="@color/color_333333"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/id_view_navigation_bottom_cash"
@@ -35,11 +35,13 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/icon_bottom_cash_default"
             android:drawablePadding="2dp"
-            android:textStyle="bold"
             android:gravity="center"
             android:text="@string/cash_check"
             android:textColor="@color/color_999999"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/id_view_navigation_bottom_user"
             android:layout_width="match_parent"
@@ -48,10 +50,10 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/icon_bottom_my_default"
             android:drawablePadding="2dp"
-            android:textStyle="bold"
             android:gravity="center"
             android:text="@string/mine"
             android:textColor="@color/color_999999"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:textStyle="bold" />
     </LinearLayout>
 </merge>
\ No newline at end of file

moduleMain/src/main/res/values/strings.xml

@@ -11,11 +11,15 @@
     <string name="user_question_2">Q2:关于优惠券如何查看及使用</string>
     <string name="user_question_3">Q3:关于充值话费未到账</string>
     <string name="user_question_4">Q4:关于平台其他权益</string>
-    <string name="user_question_5">Q5:关于退款</string>
+    <string name="user_question_5">Q6:关于退款</string>
+    <string name="user_question_6">Q5:客服电话</string>
 
     <string name="user_answer_1">注意需用支付的支付宝账号关联的手机号进行登录，即付款时的手机号进行登录，非在广告页面充值时填写的手机号码，如有疑问可联系在线客服</string>
     <string name="user_answer_2">查看：{我的}-{话费券}中查看即可\n使用：{会员权益}-{话费充值}选择充值100/200 优惠券会自动抵扣</string>
     <string name="user_answer_3">充值后会在72小时内到账，如未到账可在线咨询客服处理。</string>
     <string name="user_answer_4">各大影视平台会员折扣权益，每日秒杀权益，淘宝、外卖优惠券权益</string>
-    <string name="user_answer_5"><Data><![CDATA[如需退款，可直接点击链接进行自助退款，退款链接：<font color="#03A9F4">http://h5.zxhuichuan.com/xiaoxiang_refund</font>（最快10分钟-72小时）]]></Data></string>
+<!--    <string name="user_answer_5"><Data><![CDATA[如需退款，可直接点击链接进行自助退款，退款链接：<font color="#03A9F4">http://h5.zxhuichuan.com/xiaoxiang_refund</font>（最快10分钟-72小时）]]></Data></string>-->
+    <string name="user_answer_5">如权益未到账 可退款，填写自助退款链接后，会在72小时内操作到账（工作日），如已产生用户id 权益已到账，不支持退款。</string>
+    <string name="user_answer_6">TEL:4000033616</string>
+
 </resources>