[提交人]：王雪伟

[提交简述] ：1.1.2
[实现方案] ：加入客服问题

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

@@ -214,6 +214,7 @@ interface RounterApi {
 
     @RounterUri(Constant.scheme + "://member_order")
     fun getIntentMemberOrder(): Intent
+
     @RounterUri(Constant.scheme + "://open_member")
     fun getIntentOpenMember(): Intent
 
@@ -258,7 +259,7 @@ interface RounterApi {
     @RounterUri(Constant.scheme + "://phone_voucher")
     fun getIntentPhoneVoucher(): Intent
 
- @RounterUri(Constant.scheme + "://cardvoucher")
+    @RounterUri(Constant.scheme + "://cardvoucher")
     fun getIntentCardVoucher(@RounterParam("brand") brand: String): Intent
 
     @RounterUri(Constant.scheme + "://carddetail")
@@ -291,6 +292,9 @@ interface RounterApi {
     @RounterUri(Constant.scheme + "://search")
     fun getIntentSearch(): Intent
 
+    @RounterUri(Constant.scheme + "://user_question")
+    fun getIntentUserQuestion(): Intent
+
     @RounterUri(Constant.scheme + "://searchresult")
     fun getIntentSearchReslut(
         @RounterParam("keyword") keyword: String

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

@@ -511,6 +511,16 @@ public class JumpUtils {
         }
     }
 
+  public static void UserQuestion() {
+        try {
+            Intent intent = RounterBus.getRounter(RounterApi.class).getIntentUserQuestion();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            AppContext.get().startActivity(intent);
+        } catch (Exception e) {
+            Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
+        }
+    }
+
     public static void SearchReslutJumo(String keyword) {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentSearchReslut(keyword);

moduleMain/src/main/AndroidManifest.xml

@@ -373,6 +373,20 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activity.UserQuestionActivity"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="user_question"
+                    android:scheme="xxsqshop" />
+            </intent-filter>
+        </activity>
+
     </application>
 
 

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

@@ -7,22 +7,19 @@ import android.view.View
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.SearchGoodsTopAdapter
 import com.zxbw.modulemain.adapter.SearchReslutAdapter
 import com.zxbw.modulemain.contract.SearchContract
 import com.zxbw.modulemain.presenter.SearchPresenter
 import com.zxbw.modulemain.uitls.SPUtils
-import com.zxhl.cms.common.Constant
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.net.model.qy.TbGoodsItemEntity
-import com.zxhl.cms.net.model.shop.ShopListEntity
 import com.zxhl.cms.utils.EventUtils
 import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 import kotlinx.android.synthetic.main.activity_layout_search.*
+import me.jessyan.autosize.utils.ScreenUtils
 
 
 /**
@@ -67,7 +64,11 @@ class SearchActivity : BaseActivity(), SearchContract.View,
     }
 
     override fun init() {
-
+        var statusBarHeight = ScreenUtils.getStatusBarHeight()
+        if (statusBarHeight <= 0) {
+            statusBarHeight = 40
+        }
+        id_sys_bar_view.layoutParams.height = statusBarHeight
         id_img_back_search.setOnClickListener(this)
 //        id_search_btn.setOnClickListener(this)
         id_search_btn2.setOnClickListener(this)

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

+package com.zxbw.modulemain.activity
+
+import android.view.View
+import com.zxbw.modulemain.R
+import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.cms.utils.JumpUtils
+import kotlinx.android.synthetic.main.activity_layout_user_question.*
+import me.jessyan.autosize.utils.ScreenUtils
+
+/**
+ * @author (wangXuewei)
+ * @datetime 2022-06-21 15:40 GMT+8
+ * @detail :
+ */
+class UserQuestionActivity : BaseActivity() {
+
+    override fun layoutID(): Int {
+        return R.layout.activity_layout_user_question
+    }
+
+    override fun init() {
+        var statusBarHeight = ScreenUtils.getStatusBarHeight()
+        if (statusBarHeight <= 0) {
+            statusBarHeight = 40
+        }
+        id_sys_bar_view.layoutParams.height = statusBarHeight
+
+        id_ll_question_1.setOnClickListener(this)
+        id_ll_question_2.setOnClickListener(this)
+        id_ll_question_3.setOnClickListener(this)
+        id_ll_question_4.setOnClickListener(this)
+        id_ll_question_5.setOnClickListener(this)
+        id_ll_kefu.setOnClickListener(this)
+        id_img_back.setOnClickListener(this)
+    }
+
+
+    override fun onClick(v: View?) {
+        when (v) {
+            id_ll_question_1 -> {
+                if (id_tv_answer_1.visibility == View.VISIBLE) {
+                    id_check_question_1.isChecked = false
+                    id_tv_answer_1.visibility = View.GONE
+                } else {
+                    id_check_question_1.isChecked = true
+                    id_tv_answer_1.visibility = View.VISIBLE
+                }
+            }
+            id_ll_question_2 -> {
+                if (id_tv_answer_2.visibility == View.VISIBLE) {
+                    id_check_question_2.isChecked = false
+                    id_tv_answer_2.visibility = View.GONE
+                } else {
+                    id_check_question_2.isChecked = true
+                    id_tv_answer_2.visibility = View.VISIBLE
+                }
+            }
+            id_ll_question_3 -> {
+                if (id_tv_answer_3.visibility == View.VISIBLE) {
+                    id_check_question_3.isChecked = false
+                    id_tv_answer_3.visibility = View.GONE
+                } else {
+                    id_check_question_3.isChecked = true
+                    id_tv_answer_3.visibility = View.VISIBLE
+                }
+            }
+            id_ll_question_4 -> {
+                if (id_tv_answer_4.visibility == View.VISIBLE) {
+                    id_check_question_4.isChecked = false
+                    id_tv_answer_4.visibility = View.GONE
+                } else {
+                    id_check_question_4.isChecked = true
+                    id_tv_answer_4.visibility = View.VISIBLE
+                }
+            }
+            id_ll_question_5 -> {
+                if (id_tv_answer_5.visibility == View.VISIBLE) {
+                    id_check_question_5.isChecked = false
+                    id_tv_answer_5.visibility = View.GONE
+                } else {
+                    id_check_question_5.isChecked = true
+                    id_tv_answer_5.visibility = View.VISIBLE
+                }
+            }
+            id_ll_kefu -> {
+                JumpUtils.UDesk()
+            }
+            id_img_back -> {
+                finish()
+            }
+        }
+
+    }
+
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxbw/modulemain/box/activity/OrderDetailActivity.kt

@@ -82,7 +82,8 @@ class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContrac
         }
         id_tv_kefu?.setOnClickListener {
 //            JumpUtils.webJump("客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
-            JumpUtils.UDesk()
+//            JumpUtils.UDesk()
+            JumpUtils.UserQuestion()
 
         }
         id_rl_no_address?.setOnClickListener {

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

@@ -61,7 +61,8 @@ class HomeFragment : BaseFragment(), HomeContract.View, UpdateCallback {
         }
         id_img_kefu.setOnClickListener {
 //            JumpUtils.webJump("客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
-            JumpUtils.UDesk()
+//            JumpUtils.UDesk()
+            JumpUtils.UserQuestion()
         }
 
         val config = SettingPreference.getConfig();

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

@@ -33,7 +33,8 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
         }
         id_img_kefu?.setOnClickListener {
 //            JumpUtils.webJump("客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
-            JumpUtils.UDesk()
+//            JumpUtils.UDesk()
+            JumpUtils.UserQuestion()
         }
         id_tv_kaitong?.setOnClickListener {
             JumpUtils.MemberOrderJump()

moduleMain/src/main/res/drawable/checkbox_style.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/icon_jiantou_up" />
+    <item android:state_selected="true" android:drawable="@drawable/icon_jiantou_up"></item>
+    <item android:state_pressed="true" android:drawable="@drawable/icon_jiantou_up"></item>
+    <item android:state_checked="false" android:drawable="@drawable/icon_jiantou_down" />
+</selector>
\ No newline at end of file

moduleMain/src/main/res/drawable/shape_f7f8fb_r10.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#ffF7F8FB" />
+    <corners
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp" />
+
+</shape>
\ No newline at end of file

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

@@ -6,4 +6,16 @@
 \n2、请拍下前查询要充值号码的话费余额,如已停机的,请查询欠费多少,以免万.充值后话费还不够,不能正常开机,造成大家不必要的误会,谢谢合作;
 \n3、如充值未到账需提供APP的话费齐值记录五面截图,必要时需要提供手机服务密码,以便客服尽快核实处理。
 \n4、若订单提交后商品库存不足时,将会为您所提交订单发起退款。</string>
+
+    <string name="user_question_1">Q1:关于充值了29.9，登录app后无优惠券</string>
+    <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_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">如权益未到账 可退款，填写自助退款链接后，会在72小时内操作到账（工作日），如已产生用户id 权益已到账，不支持退款。</string>
 </resources>

moduleZxAd/src/androidTest/java/com/zx/ad/ExampleInstrumentedTest.kt

-package com.zx.ad
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.zx.ad.test", appContext.packageName)
-    }
-}
\ No newline at end of file