V1.4.5-18:fix bug

peterzhen40 · Aug 3, 2021 · 89eab39 · 89eab39
1 parent e5cc278
commit 89eab39
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/app/src/main/java/zhaoyang/soap/KotlinTestActivity.kt b/app/src/main/java/zhaoyang/soap/KotlinTestActivity.kt
@@ -56,7 +56,13 @@ class KotlinTestActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
                     val userInfo = Gson().fromJson(result, UserInfo::class.java)
                     Log.d("test", userInfo.toString())
+
+                    val result2 = Api.ktxService().getBpjhListForPeisong(userInfo.getCompNo(), "","","","","","")
+                    Log.d("test", result2.toString())
                 } catch (e: Exception) {
+                    withContext(Dispatchers.Main){
+                        textView.text = e.message
+                    }
                     Log.e("test", e.message, e)
                 }
             }

diff --git a/app/src/main/java/zhaoyang/soap/KtxService.kt b/app/src/main/java/zhaoyang/soap/KtxService.kt
@@ -19,6 +19,16 @@ interface KtxService {
         @WebParam(name = "shebei") shebei: String?
     ): String
 
+    suspend fun getBpjhListForPeisong(
+        @WebParam(name = "sn") sn: String,
+        @WebParam(name = "ipage") ipage: String,
+        @WebParam(name = "pagesize") pagesize: String,
+        @WebParam(name = "xmName") xmName: String,
+        @WebParam(name = "jhName") jhName: String,
+        @WebParam(name = "fpStartTime") fpStartTime: String,
+        @WebParam(name = "fpEndTime") fpEndTime: String
+    ): String
+
     //fun login(
     //    @WebParam(name = "username") username: String?,
     //    @WebParam(name = "password") password: String?,

diff --git a/app/src/main/java/zhaoyang/soap/UserInfo.java b/app/src/main/java/zhaoyang/soap/UserInfo.java
@@ -142,7 +142,7 @@ public int getAppType() {
     }
 
     public String getCompNo() {
-        return sn;
+        return compNo;
     }
 
     public void setCompNo(String sn) {

diff --git a/soap/build.gradle b/soap/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 17
-        versionName "1.4.4"
+        versionCode 18
+        versionName "1.4.5"
     }
     buildTypes {
         release {

diff --git a/soap/src/main/java/com/zyy/soap/Soap.java b/soap/src/main/java/com/zyy/soap/Soap.java
@@ -288,9 +288,8 @@ private String newStringCall(Class<?> service, Method method, String baseUrl, Ob
             RxLog.log(mSoapRequest.getNameSpace(), mSoapRequest.getEndPoint(),
                     mSoapRequest.getMethodName(),
                     mSoapRequest.getParams(), result,
-                    new Exception(ResultUtil.getErrorCodeMsg(result
-                            , builderSystem)));
-            throw new Exception(ResultUtil.getErrorCodeMsg(result, builderSystem));
+                    new Exception(result));
+            throw new RuntimeException(ResultUtil.getErrorCodeMsg(result, builderSystem));
         }
 
     }