dev

app/src/main/java/com/miya/fastcashier/beans/LoginRequest.kt

@@ -2,6 +2,6 @@ package com.miya.fastcashier.beans
 
 import com.google.gson.annotations.SerializedName
 
-data class LoginRequest(@SerializedName("userName") val userName: String,
+data class LoginRequest(@SerializedName("username") val username: String,
                         @SerializedName("password") val password: String,
                         @SerializedName("serialNo") val serialNo: String)

app/src/main/java/com/miya/fastcashier/service/BaseResult.kt → app/src/main/java/com/miya/fastcashier/net/BaseResult.kt

-package com.miya.fastcashier.service
+package com.miya.fastcashier.net
 
 
 data class BaseResult<T>(val code: String, val msg: String, val data: T)
\ No newline at end of file

app/src/main/java/com/miya/fastcashier/net/MiyaHttpLoggingInterceptor.java

+package com.miya.fastcashier.net;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.Connection;
+import okhttp3.Headers;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okhttp3.internal.http.HttpHeaders;
+import okhttp3.internal.platform.Platform;
+import okio.Buffer;
+import okio.BufferedSource;
+
+/**
+ * 基于原本的MiyaHttpLoggingInterceptor,本类做了如下改动：
+ * <p>
+ * 1. 请求整体写入，响应整体写入。但是请求和响应本身并不同时整体写入
+ */
+public final class MiyaHttpLoggingInterceptor implements Interceptor {
+
+    private static final Charset UTF8 = Charset.forName("UTF-8");
+
+    public enum Level {
+        /**
+         * No logs.
+         */
+        NONE,
+        /**
+         * Logs request and response lines.
+         *
+         * <p>Example:
+         * <pre>{@code
+         * --> POST /greeting http/1.1 (3-byte body)
+         *
+         * <-- 200 OK (22ms, 6-byte body)
+         * }</pre>
+         */
+        BASIC,
+        /**
+         * Logs request and response lines and their respective headers.
+         *
+         * <p>Example:
+         * <pre>{@code
+         * --> POST /greeting http/1.1
+         * Host: example.com
+         * Content-Type: plain/text
+         * Content-Length: 3
+         * --> END POST
+         *
+         * <-- 200 OK (22ms)
+         * Content-Type: plain/text
+         * Content-Length: 6
+         * <-- END HTTP
+         * }</pre>
+         */
+        HEADERS,
+        /**
+         * Logs request and response lines and their respective headers and bodies (if present).
+         *
+         * <p>Example:
+         * <pre>{@code
+         * --> POST /greeting http/1.1
+         * Host: example.com
+         * Content-Type: plain/text
+         * Content-Length: 3
+         *
+         * Hi?
+         * --> END POST
+         *
+         * <-- 200 OK (22ms)
+         * Content-Type: plain/text
+         * Content-Length: 6
+         *
+         * Hello!
+         * <-- END HTTP
+         * }</pre>
+         */
+        BODY
+    }
+
+    public interface Logger {
+        void log(String message);
+
+        /**
+         * A {@link Logger} defaults output appropriate for the current platform.
+         */
+        Logger DEFAULT = new Logger() {
+            @Override
+            public void log(String message) {
+                Platform.get().log( message, Platform.INFO,null);
+            }
+        };
+    }
+
+    public MiyaHttpLoggingInterceptor() {
+        this(Logger.DEFAULT);
+    }
+
+    public MiyaHttpLoggingInterceptor(Logger logger) {
+        this.logger = logger;
+    }
+
+    private final Logger logger;
+
+    private volatile Level level = Level.NONE;
+
+    /**
+     * Change the level at which this interceptor logs.
+     */
+    public MiyaHttpLoggingInterceptor setLevel(Level level) {
+        if (level == null) throw new NullPointerException("level == null. Use Level.NONE instead.");
+        this.level = level;
+        return this;
+    }
+
+    public Level getLevel() {
+        return level;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Level level = this.level;
+
+        Request request = chain.request();
+        if (level == Level.NONE) {
+            return chain.proceed(request);
+        }
+
+        boolean logBody = level == Level.BODY;
+        boolean logHeaders = logBody || level == Level.HEADERS;
+        RequestBody requestBody = request.body();
+        boolean hasRequestBody = requestBody != null;
+
+        Connection connection = chain.connection();
+        Protocol protocol = connection != null ? connection.protocol() : Protocol.HTTP_1_1;
+        String requestStartMessage = "--> " + request.method() + ' ' + request.url() + ' ' + protocol;
+        if (!logHeaders && hasRequestBody) {
+            requestStartMessage += " (" + requestBody.contentLength() + "-byte body)";
+        }
+        StringBuilder sbRequest = new StringBuilder();
+        sbRequest.append(requestStartMessage);
+        sbRequest.append("\n");
+
+        if (logHeaders) {
+            if (hasRequestBody) {
+                // Request body headers are only present when installed as a network interceptor. Force
+                // them to be included (when available) so there values are known.
+                if (requestBody.contentType() != null) {
+                    sbRequest.append("Content-Type: ").append(requestBody.contentType()).append("\n");
+                }
+                if (requestBody.contentLength() != -1) {
+                    sbRequest.append("Content-Length: ").append(requestBody.contentLength()).append("\n");
+                }
+            }
+
+            Headers headers = request.headers();
+            for (int i = 0, count = headers.size(); i < count; i++) {
+                String name = headers.name(i);
+                // Skip headers from the request body as they are explicitly logged above.
+                if (!"Content-Type".equalsIgnoreCase(name) && !"Content-Length".equalsIgnoreCase(name)) {
+                    sbRequest.append(name).append(": ").append(headers.value(i)).append("\n");
+                }
+            }
+
+            if (!logBody || !hasRequestBody) {
+                sbRequest.append("--> END ").append(request.method()).append("\n");
+            } else if (bodyEncoded(request.headers())) {
+                sbRequest.append("--> END ").append(request.method()).append(" (encoded body omitted)").append("\n");
+            } else {
+                Buffer buffer = new Buffer();
+                requestBody.writeTo(buffer);
+
+                Charset charset = UTF8;
+                MediaType contentType = requestBody.contentType();
+                if (contentType != null) {
+                    charset = contentType.charset(UTF8);
+                }
+
+                if (isPlaintext(buffer)) {
+                    sbRequest.append(buffer.readString(charset)).append("\n");
+                    sbRequest.append("--> END ").append(request.method()).append(" (").append(requestBody.contentLength()).append("-byte body)").append("\n");
+                } else {
+                    sbRequest.append("--> END ").append(request.method()).append(" (binary ").append(requestBody.contentLength()).append("-byte body omitted)").append("\n");
+                }
+            }
+        }
+        logger.log(sbRequest.toString());//一次写入
+        StringBuilder sbResponse = new StringBuilder();
+
+        long startNs = System.nanoTime();
+        Response response;
+        try {
+            response = chain.proceed(request);
+        } catch (Exception e) {
+            sbResponse.append("<-- HTTP FAILED: ").append(e).append("\n");
+            logger.log(sbResponse.toString());
+            throw e;
+        }
+        long tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
+
+        ResponseBody responseBody = response.body();
+
+        long contentLength = responseBody.contentLength();
+        String bodySize = contentLength != -1 ? contentLength + "-byte" : "unknown-length";
+        sbResponse.append("<-- ")
+                .append(response.code())
+                .append(' ')
+                .append(response.message())
+                .append(' ')
+                .append(response.request().url())
+                .append(" (")
+                .append(tookMs)
+                .append("ms")
+                .append(!logHeaders ? ", " + bodySize + " body" : "")
+                .append(')')
+                .append("\n");
+
+        if (logHeaders) {
+            Headers headers = response.headers();
+            for (int i = 0, count = headers.size(); i < count; i++) {
+                sbResponse.append(headers.name(i)).append(": ").append(headers.value(i)).append("\n");
+            }
+
+            if (!logBody || !HttpHeaders.hasBody(response)) {
+                sbResponse.append("<-- END HTTP").append("\n");
+            } else if (bodyEncoded(response.headers())) {
+                sbResponse.append("<-- END HTTP (encoded body omitted)").append("\n");
+            } else {
+                BufferedSource source = responseBody.source();
+                source.request(Long.MAX_VALUE); // Buffer the entire body.
+                Buffer buffer = source.buffer();
+
+                Charset charset = UTF8;
+                MediaType contentType = responseBody.contentType();
+                if (contentType != null) {
+                    try {
+                        charset = contentType.charset(UTF8);
+                    } catch (UnsupportedCharsetException e) {
+                        sbResponse.append("Couldn't decode the response body; charset is likely malformed.").append("\n");
+                        sbResponse.append("<-- END HTTP").append("\n");
+                        logger.log(sbResponse.toString());
+                        return response;
+                    }
+                }
+
+                if (!isPlaintext(buffer)) {
+                    sbResponse.append("<-- END HTTP (binary ").append(buffer.size()).append("-byte body omitted)").append("\n");
+                    logger.log(sbResponse.toString());
+                    return response;
+                }
+
+                if (contentLength != 0) {
+                    sbResponse.append(buffer.clone().readString(charset)).append("\n");
+                }
+
+                sbResponse.append("<-- END HTTP (").append(buffer.size()).append("-byte body)").append("\n");
+            }
+        }
+        logger.log(sbResponse.toString());
+        return response;
+    }
+
+    /**
+     * Returns true if the body in question probably contains human readable text. Uses a small sample
+     * of code points to detect unicode control characters commonly used in binary file signatures.
+     */
+    static boolean isPlaintext(Buffer buffer) {
+        try {
+            Buffer prefix = new Buffer();
+            long byteCount = buffer.size() < 64 ? buffer.size() : 64;
+            buffer.copyTo(prefix, 0, byteCount);
+            for (int i = 0; i < 16; i++) {
+                if (prefix.exhausted()) {
+                    break;
+                }
+                int codePoint = prefix.readUtf8CodePoint();
+                if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
+                    return false;
+                }
+            }
+            return true;
+        } catch (EOFException e) {
+            return false; // Truncated UTF-8 sequence.
+        }
+    }
+
+    private boolean bodyEncoded(Headers headers) {
+        String contentEncoding = headers.get("Content-Encoding");
+        return contentEncoding != null && !contentEncoding.equalsIgnoreCase("identity");
+    }
+}

app/src/main/java/com/miya/fastcashier/service/LoginService.kt

 package com.miya.fastcashier.service
 
+import android.util.Log
 import com.miya.fastcashier.beans.SelfCashierAccountInfo
 import com.miya.fastcashier.beans.LoginRequest;
+import com.miya.fastcashier.net.BaseResult
+import com.miya.fastcashier.net.MiyaHttpLoggingInterceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -24,10 +27,12 @@ interface LoginService {
         fun getApi(): LoginService {
             if (null == service) {
                 val httpLoggingInterceptor =
-                    HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BASIC }
+                    MiyaHttpLoggingInterceptor {
+                        Log.e("####", it)
+                    }.apply { level = MiyaHttpLoggingInterceptor.Level.BODY }
 
                 val client = OkHttpClient.Builder()
-//                    .addInterceptor(httpLoggingInterceptor)
+                    .addInterceptor(httpLoggingInterceptor)
                     .build()
 
                 val retrofit = Retrofit.Builder()
@@ -41,6 +46,7 @@ interface LoginService {
 
             return service!!
         }
+
     }
 
 }
\ No newline at end of file

app/src/main/java/com/miya/fastcashier/ui/login/LoginActivity.kt

@@ -36,12 +36,16 @@ class LoginActivity : AppCompatActivity() {
             .get(LoginViewModel::class.java)
 
         loginViewModel.loginLiveData.observe(this) { result ->
-            val selfCashierAccountInfo = result.getOrNull()
-            if (null == selfCashierAccountInfo) {
-                Log.e("######","失败")
+
+            result.getOrElse {
+                Toast.makeText(this,it.message,  Toast.LENGTH_SHORT).show()
                 return@observe
             }
-            Log.e("######",JSON.toJSONString(selfCashierAccountInfo))
+
+            result.getOrNull().also {
+                Toast.makeText(this,JSON.toJSONString(it),  Toast.LENGTH_SHORT).show()
+            }
+
         }
 
         binding.login.setOnClickListener{

app/src/main/java/com/miya/fastcashier/viewmodel/LoginViewModel.kt

 package com.miya.fastcashier.viewmodel
 
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.miya.fastcashier.beans.LoginRequest
 import com.miya.fastcashier.beans.SelfCashierAccountInfo
-import com.miya.fastcashier.service.BaseResult
+import com.miya.fastcashier.net.BaseResult
 import com.miya.fastcashier.service.LoginService
 import kotlinx.coroutines.launch
 import java.lang.RuntimeException
 
 class LoginViewModel : ViewModel() {
 
-    val loginLiveData: MutableLiveData<Result<BaseResult<SelfCashierAccountInfo>>> = MutableLiveData()
+    val loginLiveData: MutableLiveData<Result<SelfCashierAccountInfo>> = MutableLiveData()
 
     fun login(userName:String,passWord:String) {
         viewModelScope.launch {
             val result = try {
-                // 网络返回成功
-                Result.success(LoginService.getApi().login(LoginRequest(userName,passWord,"")))
+                Result.success(errorHandle(LoginService.getApi().login(LoginRequest(userName,passWord,""))))
             } catch (e: Exception) {
-                // 网络返回失败
                 Result.failure(e)
             }
             // 注意这里是主线程，直接用setValue()即可
@@ -29,4 +26,11 @@ class LoginViewModel : ViewModel() {
         }
     }
 
+    private fun <T> errorHandle(result: BaseResult<T>): T {
+        if(result.code != "200"){
+            throw RuntimeException(result.msg)
+        }
+        return result.data;
+    }
+
 }
\ No newline at end of file

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

@@ -19,6 +19,7 @@
         android:layout_marginTop="96dp"
         android:layout_marginEnd="24dp"
         android:hint="@string/prompt_email"
+        android:text="miyago"
         android:inputType="textEmailAddress"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -34,6 +35,7 @@
         android:layout_marginEnd="24dp"
         android:hint="@string/prompt_password"
         android:imeActionLabel="@string/action_sign_in_short"
+        android:text="123456"
         android:imeOptions="actionDone"
         android:inputType="textPassword"
         android:selectAllOnFocus="true"