d

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.swago.app"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 5
+        versionName "1.0.4"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

baseswago/build.gradle

@@ -92,7 +92,7 @@ dependencies {
     //Permission
     api 'com.guolindev.permissionx:permissionx:1.5.1'
     //banner
-    api 'io.github.youth5201314:banner:2.2.1'
+    api 'io.github.youth5201314:banner:2.2.2'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     api 'com.github.Zhao-Yan-Yan:MultiStatePage:2.0.2'
     api "de.hdodenhof:circleimageview:3.1.0"

baseswago/src/main/java/com/swago/baseswago/http/JsonResponseBodyConverter.kt

@@ -20,18 +20,11 @@ class JsonResponseBodyConverter<T>(
 ) : Converter<ResponseBody, T?> {
     @Throws(IOException::class)
     override fun convert(value: ResponseBody): T? {
-        var response = value.string()
+        val response = value.string()
         try {
             val jsonObject = JSONObject(response)
             val status = jsonObject.getBoolean("status")
-            response = if (!status) {
-                if (type.toString().contains("List") || type.toString().contains("ArrayList")) {
-                    jsonObject.put("data", JSONArray())
-                } else {
-                    jsonObject.put("data", JSONObject())
-                }
-                jsonObject.toString()
-            } else {
+            if (!status) {
                 throw SwagoException(jsonObject.getInt("code"), jsonObject.getString("msg"))
             }
 

baseswago/src/main/res/values-zh/strings.xml

@@ -82,7 +82,7 @@
     <string name="hot">热门</string>
     <string name="luxury">高级</string>
     <string name="pay_cancel">支付取消</string>
-    <string name="pay_fail">支付失败</string>
+    <string name="pay_fail">谷歌支付异常</string>
     <string name="send_to">赠送给%s</string>
     <string name="install_facebook">请您先安装Facebook</string>
     <string name="acccount_login">账号登陆</string>

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

@@ -87,7 +87,7 @@
     <string name="hot">Hot</string>
     <string name="luxury">Luxury</string>
     <string name="pay_cancel">Pay Cancel</string>
-    <string name="pay_fail">Pay Fail</string>
+    <string name="pay_fail">GooglePay is error</string>
     <string name="send_to">Send to %s</string>
     <string name="install_facebook">Please install Facebook Application</string>
     <string name="acccount_login">Account Login</string>

home/src/main/java/com/swago/home/innerhome/HomeVm.kt

@@ -48,17 +48,11 @@ class HomeVm(application: Application) : BaseViewModel(application) {
         requestData2 {
 
             requestData {
+                val data = ApiManager.homeApi.getHomeList(type, page)
+                val dataBanner = ApiManager.homeApi.getHomeBanner()
+                bannerListLiveData.value = dataBanner
+                hotListLiveData.value = data.list
 
-                val jobHome = async {
-                     ApiManager.homeApi.getHomeList(type, page)
-                }
-
-                val jobBanner = async {
-                    ApiManager.homeApi.getHomeBanner()
-                }
-
-                hotListLiveData.value = jobHome.await().list
-                bannerListLiveData.value = jobBanner.await()
             }
 
             requestError {

home/src/main/java/com/swago/home/innerhome/HotFragment.kt

@@ -94,10 +94,10 @@ class HotFragment : BaseListFragment<FragmentHotBinding, MomentModel>() {
             if (it != null) {
                 bannerList.clear()
                 bannerList.addAll(it)
-                headerView?.banner?.setVisibility(View.VISIBLE)
+                headerView?.banner?.visibility = View.VISIBLE
                 bannerAdapter.notifyDataSetChanged()
             }else{
-                headerView?.banner?.setVisibility(View.GONE)
+                headerView?.banner?.visibility = View.GONE
             }
         }
     }

home/src/main/java/com/swago/home/official/OfficialVm.kt

@@ -28,7 +28,6 @@ class OfficialVm(application: Application) : BaseViewModel(application) {
             }
 
             requestError {
-                Toast.makeText(AppContext.getContext(), it.message?:"", Toast.LENGTH_SHORT).show()
                 listMsgLiveData.value = null
             }
         }

home/src/main/java/com/swago/home/search/SearchVm.kt

@@ -28,7 +28,6 @@ class SearchVm (application: Application) : BaseViewModel(application) {
             }
 
             requestError {
-                Toast.makeText(AppContext.getContext(), it.message, Toast.LENGTH_SHORT).show()
                 searchResultLiveData.value = null
             }
         }