Merge branch 'master' of http://39.97.65.143:81/android/android_aiyuebao

app/src/main/java/com/wenshu/aiyuebao/ui/fragment/MyFragment.kt

@@ -497,9 +497,9 @@ class MyFragment : BaseFragment(),
      * 处理列表数据
      */
     private fun handleRecyData() {
-        userConfig?.let {
-            item_bottom_qqGroupNum.text = userConfig?.qqMsg?.useqq?.name + "：" + userConfig?.qqMsg?.useqq?.qq
-        }
+//        userConfig?.let {
+//            item_bottom_qqGroupNum.text = userConfig?.qqMsg?.useqq?.name + "：" + userConfig?.qqMsg?.useqq?.qq
+//        }
 
         dataList.clear()
         dataList.addAll(userConfig!!.autoList)
@@ -845,10 +845,10 @@ class MyFragment : BaseFragment(),
                 bundle.putString(WebActivity.WEB_URL, Constant.STRATEGY_URL)
                 readyGo(WebActivity::class.java, bundle)
             }
-            R.id.item_customer_service -> {
-                // 跳转加入QQ群
-                jumpQQGroup()
-            }
+//            R.id.item_customer_service -> {
+//                // 跳转加入QQ群
+//                jumpQQGroup()
+//            }
             R.id.item_title_id -> {
                 if (!userManager.userIsLogin()) {
                     readyGo(WxLoginActivity::class.java)
@@ -1151,7 +1151,7 @@ class MyFragment : BaseFragment(),
         btn_coinRecord.setOnClickListener(this)
         item_title_friends.setOnClickListener(this)
         ll_my_login.setOnClickListener(this)
-        item_customer_service.setOnClickListener(this)
+//        item_customer_service.setOnClickListener(this)
 
         vp_grid.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
             override fun onPageScrollStateChanged(state: Int) {

app/src/main/res/layout/fragment_main_my.xml

@@ -68,7 +68,7 @@
                     android:nestedScrollingEnabled="false"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-                <include layout="@layout/item_fragment_main_my_customer_service" />
+<!--                <include layout="@layout/item_fragment_main_my_customer_service" />-->
 
             </LinearLayout>