...

app/src/main/java/com/base/pdfviewerscannerwhite/ui/document/excel/ExcelActivity.kt

@@ -8,14 +8,19 @@ import android.view.View
 import android.view.animation.Animation
 import android.view.animation.TranslateAnimation
 import androidx.activity.addCallback
+import androidx.lifecycle.lifecycleScope
 import com.base.pdfviewerscannerwhite.bean.DocumentBean
 import com.base.pdfviewerscannerwhite.databinding.ActivityExcelBinding
 import com.base.pdfviewerscannerwhite.helper.BaseActivity
 import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentMore
 import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.hideKeyboard
 import com.base.pdfviewerscannerwhite.utils.LogEx
+import com.base.pdfviewerscannerwhite.utils.ToastUtils.toast
 import com.cherry.lib.doc.bean.DocEngine
+import com.cherry.lib.doc.office.ss.control.SSControl
 import com.cherry.lib.doc.util.Constant
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.io.File
 
 class ExcelActivity : BaseActivity<ActivityExcelBinding>() {
@@ -78,6 +83,12 @@ class ExcelActivity : BaseActivity<ActivityExcelBinding>() {
                 LogEx.logDebug(TAG, "show")
             }
         }
+        lifecycleScope.launch {
+            delay(5000)
+            val ssControl = binding.mDocView.iOffice?.control?.appControl as SSControl
+            toast("转换")
+            binding.mDocView.iOffice?.control?.sysKit
+        }
     }
 
     private fun switchOrientation() {

app/src/main/java/com/base/pdfviewerscannerwhite/ui/document/word/WordActivity.kt

 package com.base.pdfviewerscannerwhite.ui.document.word
 
+import android.content.pm.ActivityInfo
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.TranslateAnimation
 import android.widget.Toast
 import androidx.activity.addCallback
+import com.base.pdfviewerscannerwhite.bean.DocumentBean
 import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding
 import com.base.pdfviewerscannerwhite.helper.BaseActivity
+import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentMore
 import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.hideKeyboard
 import com.base.pdfviewerscannerwhite.utils.LogEx
 import com.cherry.lib.doc.widget.PoiViewer
@@ -33,6 +36,12 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
         binding.flFanhui.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()
         }
+        binding.ivXuanzhuan.setOnClickListener {
+            switchOrientation()
+        }
+        binding.ivMore.setOnClickListener {
+            showDocumentMore(DocumentBean.TYPE_WORD)
+        }
 
         mPoiViewer.singleTapAction = {
             LogEx.logDebug(TAG, "singleTapAction")
@@ -47,6 +56,14 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
 
     }
 
+    private fun switchOrientation() {
+        requestedOrientation = if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+        } else {
+            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+        }
+    }
+
     private fun word2Html(sourceFilePath: String) {
         mPoiViewer = PoiViewer(this)
         try {

library/src/main/java/com/cherry/lib/doc/office/ss/control/SSControl.java

@@ -60,7 +60,6 @@ public class SSControl extends AbstractControl
     public SSControl(IControl mainControl, Workbook book, String filepath)
     {
         this.mainControl = mainControl;
-        //this.spreadSheet = new Spreadsheet(getMainFrame().getActivity(), filepath, book, this);
         this.excelView = new ExcelView(getMainFrame().getActivity(), filepath, book, this);
         this.spreadSheet = excelView.getSpreadsheet();
     }

library/src/main/java/com/cherry/lib/doc/office/system/IReader.java

@@ -13,7 +13,6 @@ public interface IReader
 
     /**
      * get model data
-     * @param filePath
      * @return
      */
     public Object getModel() throws Exception;

library/src/main/java/com/cherry/lib/doc/office/system/MainControl.java

@@ -682,7 +682,7 @@ public class MainControl extends AbstractControl {
     private Handler handler;
     private int docSourceType;
     //
-    private IControl appControl;
+    public IControl appControl;
     //
     public SysKit sysKit;
     //

library/src/main/java/com/cherry/lib/doc/widget/DocView.kt

@@ -26,6 +26,7 @@ import com.cherry.lib.doc.bean.FileType
 import com.cherry.lib.doc.databinding.DocViewBinding
 import com.cherry.lib.doc.interfaces.OnDocPageChangeListener
 import com.cherry.lib.doc.office.IOffice
+import com.cherry.lib.doc.office.ss.control.SSControl
 import com.cherry.lib.doc.util.FileUtils
 import com.cherry.lib.doc.util.ViewUtils.hide
 import com.cherry.lib.doc.util.ViewUtils.show
@@ -63,6 +64,8 @@ class DocView : FrameLayout {
     var sourceFilePath: String? = null
     var mViewPdfInPage: Boolean = true
 
+    var iOffice: IOffice? = null
+
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) {
@@ -205,7 +208,7 @@ class DocView : FrameLayout {
 
     fun showDoc(activity: Activity, mDocContainer: ViewGroup?, url: String?, docSourceType: Int, fileType: Int) {
         Log.e(TAG, "showDoc()......")
-        val iOffice: IOffice = object : IOffice() {
+        iOffice = object : IOffice() {
             override fun onEventMethod(
                 v: View?,
                 e1: MotionEvent?,
@@ -275,7 +278,7 @@ class DocView : FrameLayout {
             }
 
         }
-        iOffice.openFile(url, docSourceType, fileType.toString())
+        iOffice?.openFile(url, docSourceType, fileType.toString())
     }
 
 

library/src/main/java/com/cherry/lib/doc/widget/MyOnTouchLister.kt

@@ -6,7 +6,7 @@ import android.view.MotionEvent
 import android.view.View
 import kotlin.math.sqrt
 
-const val TAP_THRESHOLD = 200
+const val TAP_THRESHOLD = 100
 const val TAP_INTERVAL = 250
 
 class MyOnTouchLister : View.OnTouchListener {