DormitoryApi: Use GB2312 charset to decode string

Signed-off-by: Fung <[email protected]>

Author: fython

app/src/main/kotlin/moe/feng/scut/autowifi/MainActivity.kt

@@ -41,11 +41,16 @@ class MainActivity : Activity(), AnkoLogger {
 
 	private fun doConnect() {
 		doAsync {
-			val isConnected = DormitoryApi
+			val result = DormitoryApi
 					.setCurrentIp(WifiUtils.getCurrentIP(this@MainActivity))
-					.connect("", "")
+					.connect(username = "", password = "")
+			val errCode = DormitoryApi.checkError()
 			uiThread {
-				info("isConnected: $isConnected")
+				val dialog = AlertDialogBuilder(this@MainActivity)
+				dialog.title(if (result is String && result.contains("登陆成功", false)) "Success" else "Fail")
+				dialog.message("$result\n\n$errCode")
+				dialog.okButton { }
+				dialog.show()
 			}
 		}
 	}

app/src/main/kotlin/moe/feng/scut/autowifi/api/DormitoryApi.kt

@@ -1,6 +1,7 @@
 package moe.feng.scut.autowifi.api
 
 import moe.feng.scut.autowifi.support.HttpUtils
+import java.nio.charset.Charset
 
 class DormitoryApi {
 
@@ -16,7 +17,7 @@ class DormitoryApi {
 			return this
 		}
 
-		fun connect(username : String, password : String) : Boolean {
+		fun connect(username : String, password : String) : String? {
 			val operation = "Login"
 
 			val result = HttpUtils.postForm(
@@ -34,7 +35,13 @@ class DormitoryApi {
 							"upass" to password
 					)
 			)
-			return result is String && result.contains("已经成功登录")
+			// return result is String && result.contains("已经成功登录")
+			return if (result is ByteArray) String(bytes = result, charset = Charset.forName("GB2312")) else null
+		}
+
+		fun checkError() : String? {
+			val result = HttpUtils.get("https://s.scut.edu.cn/errcode")
+			return if (result is ByteArray) String(bytes = result, charset = Charset.forName("GB2312")) else null
 		}
 
 		fun getWlanCenterIp(ip : String) : String {

app/src/main/kotlin/moe/feng/scut/autowifi/support/HttpUtils.kt

@@ -22,21 +22,22 @@ class HttpUtils {
 			okHttpClient = OkHttpClient.Builder().cookieJar(cookieJar).build()
 		}
 
-		fun get(url : String) : String? {
+		fun get(url : String) : ByteArray? {
 			Log.d(TAG, "Request url: " + url)
 			val request = Request.Builder().url(url).build()
 			try {
 				val response = okHttpClient.newCall(request).execute()
 				Log.d(TAG, "Response code:" + response.code())
-				val result = response.body().string()
+				val result = response.body().bytes()
+				Log.d(TAG, "Response data: " + String(result))
 				return result
 			} catch (e : Exception) {
 				e.printStackTrace()
 				return null
 			}
 		}
 
-		fun postForm(url: String, params: Map<String, Any>?): String? {
+		fun postForm(url: String, params: Map<String, Any>?): ByteArray? {
 			Log.d(TAG, "Request url: " + url)
 			val builder = FormBody.Builder()
 			if (params != null) for ((key, value) in params) {
@@ -48,7 +49,8 @@ class HttpUtils {
 			try {
 				val response = okHttpClient.newCall(request).execute()
 				Log.d(TAG, "Response code: " + response.code())
-				val result = response.body().string()
+				val result = response.body().bytes()
+				Log.d(TAG, "Response data: " + String(result))
 				return result
 			} catch (e: Exception) {
 				e.printStackTrace()