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 83314ff8c55cd4cb5801ed1f8dd424f7db714a1d..935ead3bb2e8e1c73bf75c0d3793177fd289c462 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 bdbadf39b86de5a6f5a5651f36105d1fee916a7b..051fd9e8a2c5c340bdd71e47bc284dc6d5b7b15c 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 a7f36339db7947e5d8fade7260745f92a299c93f..882171c3aa15f7bfbaa0d88e36669aa25c620082 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 = - "\n" + "" + " " + " f" + " "