Decoupling http operations.

2026-04-06 01:01:27 +08:00 · 2022-09-14 19:19:34 +08:00
parent 6ef0c5835c
commit 29a398a66a
8 changed files with 101 additions and 47 deletions
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="G:\Android\Avd\Pixel_4_API_31.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-09-14T07:53:33.671044700Z" />
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,6 +13,7 @@
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v24/avd_anim.xml" value="0.2915" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.11944444444444445" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable/a.xml" value="0.192" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable/activity_tool_ip.xml" value="0.2495" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable/animation_dark_to_light_mode.xml" value="0.2915" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable/animation_down_to_right_arrow.xml" value="0.22" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable/animation_light_to_dark_mode.xml" value="0.2915" />
@@ -73,6 +74,7 @@
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/activity_main.xml" value="0.1" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/activity_splash.xml" value="0.1693840579710145" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/activity_time_screen.xml" value="0.34739583333333335" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/activity_tool_ip.xml" value="0.29628046173578454" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/activity_tool_time_screen.xml" value="0.1" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/activity_tool_translation.xml" value="0.1" />
        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/app_bar_main.xml" value="0.1" />
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
        multiDexEnabled true

        Properties buildPro = loadBuildPro()
-        buildConfigField "String", "API_APP_ID", buildPro['apiAppId']
-        buildConfigField "String", "API_APP_SECRET", buildPro['apiAppSecret']
+        buildConfigField "String", "ROLL_APP_ID", buildPro['rollAppId']
+        buildConfigField "String", "ROLL_APP_SECRET", buildPro['rollAppSecret']
    }

    signingConfigs {
@@ -100,11 +100,11 @@ dependencies {
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.2'
    implementation 'androidx.core:core-splashscreen:1.0.0'
    implementation 'com.google.android.material:material:1.6.1'

--- a/app/src/main/java/com/fatapp/oxygentoolbox/tools/translation/MainActivity.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/tools/translation/MainActivity.java
@@ -19,9 +19,10 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;

 import com.fatapp.oxygentoolbox.R;
-import com.fatapp.oxygentoolbox.tools.translation.util.ResponseListener;
 import com.fatapp.oxygentoolbox.util.ResourceUtil;
 import com.fatapp.oxygentoolbox.util.ToolsList;
+import com.fatapp.oxygentoolbox.util.http.HttpHelper;
+import com.fatapp.oxygentoolbox.util.http.ResponseListener;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;

@@ -29,20 +30,15 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.StringJoiner;

-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
 public class MainActivity extends AppCompatActivity {
    private final String TOOL_NAME = ToolsList.getToolName(getClass().getName());
-    private final String URL_YOU_DAO = "http://fanyi.youdao.com/translate?&doctype=json&type=%s&i=%s";
+    final String URL_YOU_DAO = "http://fanyi.youdao.com/translate?&doctype=json&type=%s&i=%s";

    private final String LANGUAGE_CHINESE = "ZH_CN";
    private final String LANGUAGE_ENGLISH = "EN";
@@ -155,7 +151,8 @@ public class MainActivity extends AppCompatActivity {
        progressBarInTranslation.setVisibility(View.VISIBLE);

        ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(editTextFrom.getWindowToken(), 0);
-        translateYouDao(languageFrom, languageTo, editTextFrom.getText().toString(), new ResponseListener() {
+
+        final HttpHelper httpHelper = new HttpHelper(this, URL_YOU_DAO, new ResponseListener() {
            @Override
            public void onResponse(int code, String responseBody) {
                if (code == 200) {
@@ -191,32 +188,15 @@ public class MainActivity extends AppCompatActivity {
                Snackbar.make(constraintLayoutRoot, "翻译失败", Snackbar.LENGTH_LONG).show();
            }
        });
-    }

-    private void translateYouDao(String from, String to, String text, @NonNull ResponseListener responseListener) {
-        if (from.equals(to)) {
-            responseListener.onFailed();
-            return;
-        }
-
-        new Thread() {
-            @Override
-            public void run() {
-                OkHttpClient okHttpClient = new OkHttpClient();
-                try {
-                    Request request = new Request.Builder().url(String.format(URL_YOU_DAO, from.toUpperCase() + 2 + to.toUpperCase(), URLEncoder.encode(text, StandardCharsets.UTF_8.toString()))).build();
-                    try (Response response = okHttpClient.newCall(request).execute()) {
-                        int code = response.code();
-                        String body = Objects.requireNonNull(response.body()).string();
-                        runOnUiThread(() -> responseListener.onResponse(code, body));
-                    } catch (IOException e) {
-                        runOnUiThread(responseListener::onFailed);
-                    }
-                } catch (UnsupportedEncodingException e) {
-                    runOnUiThread(responseListener::onFailed);
-                }
+        try {
+            if (languageFrom.equals(languageTo)) {
+                httpHelper.getResponseListener().onFailed();
            }
-        }.start();
+            httpHelper.request(languageFrom.toUpperCase() + 2 + languageTo.toUpperCase(), URLEncoder.encode(editTextFrom.getText().toString(), StandardCharsets.UTF_8.toString()));
+        } catch (UnsupportedEncodingException e) {
+            httpHelper.getResponseListener().onFailed();
+        }
    }

    @Override
--- a/app/src/main/java/com/fatapp/oxygentoolbox/util/http/HttpHelper.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/http/HttpHelper.java
@@ -0,0 +1,63 @@
+package com.fatapp.oxygentoolbox.util.http;
+
+import android.app.Activity;
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Objects;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class HttpHelper {
+    private final Activity activity;
+    private String url;
+    private ResponseListener responseListener;
+
+    public HttpHelper(Activity activity, String url) {
+        this.activity = activity;
+        this.url = url;
+    }
+
+    public HttpHelper(Activity activity, String url, ResponseListener responseListener) {
+        this.activity = activity;
+        this.url = url;
+        this.responseListener = responseListener;
+    }
+
+    public void request(String... args) {
+        new Thread() {
+            @Override
+            public void run() {
+                Log.d("args", Arrays.toString(args));
+                OkHttpClient okHttpClient = new OkHttpClient();
+                Request request = new Request.Builder().url(String.format(url, Arrays.asList(args).toArray())).build();
+                try (Response response = okHttpClient.newCall(request).execute()) {
+                    int code = response.code();
+                    String body = Objects.requireNonNull(response.body()).string();
+                    activity.runOnUiThread(() -> responseListener.onResponse(code, body));
+                } catch (IOException e) {
+                    activity.runOnUiThread(() -> responseListener.onFailed());
+                }
+            }
+        }.start();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public ResponseListener getResponseListener() {
+        return responseListener;
+    }
+
+    public void setResponseListener(ResponseListener responseListener) {
+        this.responseListener = responseListener;
+    }
+}
--- a/app/src/main/java/com/fatapp/oxygentoolbox/tools/translation/util/ResponseListener.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/tools/translation/util/ResponseListener.java
@@ -1,4 +1,4 @@
-package com.fatapp.oxygentoolbox.tools.translation.util;
+package com.fatapp.oxygentoolbox.util.http;

 public interface ResponseListener {
    void onResponse(int code, String responseBody);
--- a/app/src/main/res/raw/dependencies.json
+++ b/app/src/main/res/raw/dependencies.json
--- a/app/src/test/java/com/fatapp/oxygentoolbox/Tester.java
+++ b/app/src/test/java/com/fatapp/oxygentoolbox/Tester.java
@@ -1,7 +1,5 @@
 package com.fatapp.oxygentoolbox;

-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;

 import java.io.UnsupportedEncodingException;
@@ -13,10 +11,4 @@ public class Tester {
    public void urlEncodeTest() throws UnsupportedEncodingException {
        System.out.println(URLEncoder.encode(" ", StandardCharsets.UTF_8.toString()));
    }
-
-    @Test
-    public void buildConfigTest() {
-        assertEquals("123456789", BuildConfig.API_APP_ID);
-        assertEquals("abcdefg", BuildConfig.API_APP_SECRET);
-    }
 }