消息优化

app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageService.kt

@@ -32,7 +32,6 @@ class PushMessageService : JPushMessageService() {
             message.notificationExtras,
             PushBean::class.java
         )
-        println("fasdf")
         try {
             when (pushBean.messageType) {
                 "100" -> {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt

@@ -30,6 +30,7 @@ import com.arpa.glex.bean.OrderBean
 import com.arpa.glex.bean.UserBean
 import com.arpa.glex.bean.UserDetail
 import com.arpa.hndahesudintocctmsdriver.bean.MyJtt
+import com.arpa.hndahesudintocctmsdriver.utils.GDLocationUtils
 import com.arpa.mylibrary.base.BaseFragment
 import com.arpa.mylibrary.callback.RefreshCallBack
 import com.arpa.mylibrary.net.CommonResponseBean
@@ -60,6 +61,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
 
     override fun onFragmentVisibleChange(isVisible: Boolean) {
         if (isVisible) {
+
         }
 
     }
@@ -191,6 +193,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
                     })
             )
 
+        //获取当前位置
+        getLocation()
 
         DataManager.getInstance().getUserInfo()
             .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
@@ -315,4 +319,12 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
 
     }
 
+    private fun getLocation(){
+        GDLocationUtils.instance.getLocation(mContext){
+            if (it.errorCode == 0) {
+                binding.tvCity.text = it.city.substring(0,2)
+            }
+        }
+    }
+
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/weight/pop/InputMoneyPop.kt

@@ -33,7 +33,7 @@ class InputMoneyPop(
         val btnOk = findViewById<Button>(R.id.btnOk)
 
         tvName.text = """提现到
-            |${userInfo.driverBankcardName}${userInfo.driverBankcardNumber.substring(userInfo.driverBankcardNumber.length - 4)}
+            |${userInfo.driverBankcardAddress}${userInfo.driverBankcardNumber.substring(userInfo.driverBankcardNumber.length - 4)}
         """.trimMargin()
         etMoney.setSelection(etMoney.length())
 

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

@@ -60,6 +60,7 @@
                     android:orientation="horizontal">
 
                     <TextView
+                        android:id="@+id/tvCity"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="郑州"

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

@@ -49,6 +49,7 @@
         android:textSize="@dimen/sp_14"></TextView>
 
     <View
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_1"
         android:layout_below="@+id/tvProduct"
@@ -57,6 +58,7 @@
 
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/tvProduct"