Browse Source

PDFTool(Android) - 更新2.0.0 sdk

liuxiaolong 1 year ago
parent
commit
85b9badc05

BIN
ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar


BIN
ComPDFKit_Repo/compdfkit/ComPDFKit.aar


+ 1 - 1
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/font/CExternFontSpinnerAdapter.java

@@ -74,7 +74,7 @@ public class CExternFontSpinnerAdapter extends BaseAdapter {
             if (position < list.size()) {
                 CPDFTextAttribute.FontNameHelper.FontType fontType = (CPDFTextAttribute.FontNameHelper.FontType) getItem(position);
                 String fontName = CPDFTextAttribute.FontNameHelper.obtainFontName(fontType, false, false);
-                Typeface typeface = CPDFTextAttribute.FontNameHelper.getInnerTypeface(textView.getContext(), fontName);
+                Typeface typeface = CPDFTextAttribute.FontNameHelper.getTypeface(textView.getContext(), fontName);
                 textView.setTypeface(typeface);
                 textView.setText(fontType == CPDFTextAttribute.FontNameHelper.FontType.Unknown ? "Unknown" : fontName);
             } else {

+ 1 - 1
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/font/CFontSpinnerAdapter.java

@@ -59,7 +59,7 @@ public class CFontSpinnerAdapter extends BaseAdapter {
             AppCompatTextView textView = convertView.findViewById(R.id.tv_menu_title);
             CPDFTextAttribute.FontNameHelper.FontType fontType = (CPDFTextAttribute.FontNameHelper.FontType) getItem(position);
             String fontName = CPDFTextAttribute.FontNameHelper.obtainFontName(fontType, false, false);
-            Typeface typeface = CPDFTextAttribute.FontNameHelper.getInnerTypeface(textView.getContext(), fontName);
+            Typeface typeface = CPDFTextAttribute.FontNameHelper.getTypeface(textView.getContext(), fontName);
             if (fontType == CPDFTextAttribute.FontNameHelper.FontType.Unknown){
                 textView.setTypeface(Typeface.DEFAULT);
                 textView.setText(CPDFTextAttribute.FontNameHelper.FontType.Unknown.name());

+ 2 - 2
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/font/CFontSpinnerAdapter1.java

@@ -63,7 +63,7 @@ public class CFontSpinnerAdapter1 extends BaseAdapter {
             AppCompatTextView textView = convertView.findViewById(R.id.tv_menu_title);
             CPDFFontName cpdfFontName = list.get(position);
             String familyName = cpdfFontName.getFamilyName();
-            String outFont = CPDFTextAttribute.FontNameHelper.obtainOutFontName(familyName, false, false);
+            String outFont = CPDFTextAttribute.FontNameHelper.obtainFontName(familyName, false, false);
             Typeface typeface = CPDFTextAttribute.FontNameHelper.getTypeface(mContext, outFont);
             textView.setTypeface(typeface);
             textView.setText(familyName);
@@ -85,7 +85,7 @@ public class CFontSpinnerAdapter1 extends BaseAdapter {
     public List<CFontStyleItemBean> getFontStyleList(CPDFFontName cpdfFontName) {
         List<CFontStyleItemBean> styleItemBeans = new ArrayList<>();
         for (String styleName : cpdfFontName.getStyleName()) {
-            String psName = CPDFTextAttribute.FontNameHelper.obtainOutFontName(cpdfFontName.getFamilyName(), styleName);
+            String psName = CPDFTextAttribute.FontNameHelper.obtainFontName(cpdfFontName.getFamilyName(), styleName);
             if (styleName.equals("Regular")) {
                 styleItemBeans.add(0, new CFontStyleItemBean(styleName, psName));
             } else {