From 006658b98c8c7d4afb380bd30c7836f4ff139004 Mon Sep 17 00:00:00 2001
From: dirk41 <1378902882@qq.com>
Date: Fri, 20 Aug 2021 17:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/github/kexanie/library/MathView.java   | 15 +++++-
 .../kexanie/library/TypedAttrUtils.java       | 52 -------------------
 .../mathviewtest/slice/MainAbilitySlice.java  |  2 +-
 3 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/MathView/src/main/java/io/github/kexanie/library/MathView.java b/MathView/src/main/java/io/github/kexanie/library/MathView.java
index 83314ff..935ead3 100644
--- a/MathView/src/main/java/io/github/kexanie/library/MathView.java
+++ b/MathView/src/main/java/io/github/kexanie/library/MathView.java
@@ -87,15 +87,21 @@ public class MathView extends WebView {
                             return super.processResourceRequest(webView, request);
                         }
                         String mimeType = URLConnection.guessContentTypeFromName(localFile);
+                        InputStream inputStream = null;
                         try {
-                            InputStream inputStream = new FileInputStream(file);
+                            inputStream = new FileInputStream(file);
                             return new ResourceResponse(mimeType, inputStream, null);
                         } catch (IOException e) {
                             e.toString();
+                        } finally {
+                            try {
+                                inputStream.close();
+                            } catch (IOException e) {
+                                e.toString();
+                            }
                         }
                     }
                 }
-
                 return super.processResourceRequest(webView, request);
             }
 
@@ -129,6 +135,11 @@ public class MathView extends WebView {
         }
     }
 
+    /**
+     * getText
+     *
+     * @return String
+     */
     public String getText() {
         return mText;
     }
diff --git a/MathView/src/main/java/io/github/kexanie/library/TypedAttrUtils.java b/MathView/src/main/java/io/github/kexanie/library/TypedAttrUtils.java
index bdbadf3..051fd9e 100644
--- a/MathView/src/main/java/io/github/kexanie/library/TypedAttrUtils.java
+++ b/MathView/src/main/java/io/github/kexanie/library/TypedAttrUtils.java
@@ -17,20 +17,10 @@ package io.github.kexanie.library;
 
 import ohos.agp.components.Attr;
 import ohos.agp.components.AttrSet;
-import ohos.agp.text.Font;
 import ohos.agp.utils.Color;
-import ohos.app.Context;
-import ohos.app.Environment;
-import ohos.global.resource.RawFileEntry;
-import ohos.global.resource.Resource;
-import ohos.global.resource.ResourceManager;
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.NoSuchElementException;
 
 /**
@@ -193,46 +183,4 @@ public final class TypedAttrUtils {
         }
         return attr;
     }
-
-    /**
-     * getFont
-     *
-     * @param context context
-     * @param fontFileName fontFileName
-     * @return Font
-     */
-    public static Font getFont(Context context, String fontFileName) {
-        ResourceManager resManager = context.getResourceManager();
-        RawFileEntry rawFileEntry = resManager.getRawFileEntry("resources/rawfile/" + fontFileName);
-        Resource resource;
-        try {
-            resource = rawFileEntry.openRawFile();
-        } catch (IOException e) {
-            return Font.DEFAULT;
-        }
-        File file = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), fontFileName);
-        OutputStream outputStream = null;
-        try {
-            outputStream = new FileOutputStream(file);
-            int index;
-            byte[] bytes = new byte[1024];
-            while ((index = resource.read(bytes)) != -1) {
-                outputStream .write(bytes, 0, index);
-                outputStream .flush();
-            }
-        } catch (IOException e) {
-            return Font.DEFAULT;
-        } finally {
-            try {
-                resource.close();
-                if (outputStream != null) {
-                    outputStream.close();
-                }
-            } catch (IOException e) {
-                return Font.DEFAULT;
-            }
-        }
-        Font.Builder builder = new Font.Builder(file);
-        return builder.build();
-    }
 }
diff --git a/entry/src/main/java/io/github/kexanie/mathviewtest/slice/MainAbilitySlice.java b/entry/src/main/java/io/github/kexanie/mathviewtest/slice/MainAbilitySlice.java
index a7f3633..882171c 100644
--- a/entry/src/main/java/io/github/kexanie/mathviewtest/slice/MainAbilitySlice.java
+++ b/entry/src/main/java/io/github/kexanie/mathviewtest/slice/MainAbilitySlice.java
@@ -21,7 +21,7 @@ public class MainAbilitySlice extends AbilitySlice {
             + " \\(ax^2 + bx + c = 0\\) "
             + "or displayed formula: $$\\sum_{i=0}^n i^2 = \\frac{(n^2+n)(2n+1)}{6}$$";
     String mathml =
-            "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" mathcolor=\"black\">\n"
+            "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" mathcolor=\"black\">"
                     + "  <mrow>"
                     + "    <mi>f</mi>"
                     + "    <mrow>"
-- 
Gitee