Browse Source

bug修复

libai 1 year ago
parent
commit
4c8007e134

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


BIN
ComPDFKit_Repo/compdfkit/ComPDFKit.aar


+ 9 - 3
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/dialog/CEditDialog.java

@@ -98,12 +98,18 @@ public class CEditDialog extends DialogFragment {
         CViewUtils.showKeyboard(editText);
         btnCancel.setOnClickListener(v -> dismiss());
         btnAdd.setOnClickListener(v -> {
-            if (!TextUtils.isEmpty(editText.getText())) {
-                String title = editText.getText().toString().trim();
+                String title = "";
+                if (editText.getText() != null) {
+                    title = editText.getText().toString().trim();
+                }
+//                if (TextUtils.isEmpty(title)) {
+//                    title = "";
+//                }
+
                 if (editListener != null) {
                     editListener.edit(title);
                 }
-            }
+
         });
     }
 

+ 1 - 0
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfsearch/CSearchResultDialogFragment.java

@@ -121,6 +121,7 @@ public class CSearchResultDialogFragment extends CBasicBottomSheetDialogFragment
                     searchReplace.replaceAll(content);
                     CThreadPoolUtils.getInstance().executeMain(() -> {
                         if (replaceListener != null) {
+                            pdfView.getCPdfReaderView().reloadPages();
                             replaceListener.onReplaceEnd();
                         }
                         loadingDialog.dismiss();

+ 1 - 1
ComPDFKit_Tools/src/main/res/values-zh-rCN/tools_strings.xml

@@ -48,7 +48,7 @@
     <string name="tools_edit_bookmark_title">编辑书签</string>
     <string name="tools_no_bookmarks">无书签</string>
     <string name="tools_add_bookmarks">添加书签</string>
-    <string name="tools_has_bookmark">You\'ve bookmarked about this</string>
+    <string name="tools_has_bookmark">已添加书签</string>
     <string name="tools_bookmark_et_hint">输入书签标题</string>
     <string name="tools_page">页码</string>
     <string name="tools_edit">编辑</string>

+ 3 - 3
PDFViewer/src/main/java/com/compdfkit/pdfviewer/MainActivity.java

@@ -305,7 +305,7 @@ public class MainActivity extends CBasicPDFActivity {
                     }
                 });
             });
-            menuWindow.addItem(R.drawable.tools_ic_add_security, R.string.tools_security, v1 -> {
+            /*menuWindow.addItem(R.drawable.tools_ic_add_security, R.string.tools_security, v1 -> {
                 CPDFDocument document = binding.pdfView.getCPdfReaderView().getPDFDocument();
                 if (document.getPermissions() == CPDFDocument.PDFDocumentPermissions.PDFDocumentPermissionsUser) {
                     CInputOwnerPwdDialog inputOwnerPwdDialog = CInputOwnerPwdDialog.newInstance();
@@ -333,7 +333,7 @@ public class MainActivity extends CBasicPDFActivity {
                     CToastUtil.showLongToast(this, R.string.tools_watermark_add_success);
                 });
                 watermarkEditDialog.show(getSupportFragmentManager(), "watermarkEditDialog");
-            });
+            });*/
             menuWindow.addItem(R.drawable.tools_ic_document_info, R.string.tools_document_info, v1 -> {
                 showDocumentInfo(binding.pdfView);
             });
@@ -411,7 +411,7 @@ public class MainActivity extends CBasicPDFActivity {
             });
             searchResultDialog.setReplaceListener(()->{
                 binding.pdfSearchToolBar.exitSearch();
-                setPreviewMode(CPreviewMode.Viewer);
+                //setPreviewMode(CPreviewMode.Viewer);
             });
         });
         binding.pdfSearchToolBar.setOnExitSearchListener(new CSearchToolbar.OnSearchListener() {

+ 2 - 1
PDFViewer/src/main/java/com/compdfkit/pdfviewer/home/DocumentListFragment.java

@@ -132,9 +132,10 @@ public class DocumentListFragment extends Fragment {
             HomeFunBean bean = adapter.list.get(position);
             if (bean.getType() == HomeFunBean.FunType.SamplePDF) {
                 // Display corresponding functions according to the selected function type
-                enterFunctions(bean.getFilePath(), null);
+                enterFunctions(bean.getFilePath(), null);  //kkkkk
             }
         });
+        enterFunctions(funListAdapter.list.get(0).getFilePath(), null);
     }
 
     public List<HomeFunBean> getDocumentList() {