Commit d5910c84 authored by wanglei's avatar wanglei

...

parent 5d25cf28
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES"
android:value="document_ui" />
<application <application
android:name=".helper.MyApplication" android:name=".helper.MyApplication"
android:allowBackup="true" android:allowBackup="true"
......
...@@ -46,7 +46,6 @@ import com.base.pdfreader2.utils.IntentShareUtils.shareMutDocuments ...@@ -46,7 +46,6 @@ import com.base.pdfreader2.utils.IntentShareUtils.shareMutDocuments
import com.base.pdfreader2.utils.LogEx import com.base.pdfreader2.utils.LogEx
import com.base.pdfreader2.utils.PermissionUtils.checkNotificationPermission import com.base.pdfreader2.utils.PermissionUtils.checkNotificationPermission
import com.base.pdfreader2.utils.PermissionUtils.checkStorePermission import com.base.pdfreader2.utils.PermissionUtils.checkStorePermission
import com.base.pdfreader2.utils.PermissionUtils.requestStoragePermission
import com.base.pdfreader2.utils.ShortcutUtils.addDeskShortCut import com.base.pdfreader2.utils.ShortcutUtils.addDeskShortCut
import com.base.pdfreader2.utils.updateMediaStore import com.base.pdfreader2.utils.updateMediaStore
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
...@@ -219,6 +218,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -219,6 +218,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
binding.ivScanGuide.setOnClickListener { binding.ivScanGuide.setOnClickListener {
useGmsScanFunction() useGmsScanFunction()
} }
binding.ivScan.setOnClickListener {
useGmsScanFunction()
}
actionIdOperation() actionIdOperation()
} }
...@@ -535,7 +537,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -535,7 +537,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
// binding.tvTest.text = "imageUri=$imageUri\n\n\n\npdfUri=$pdfUri" // binding.tvTest.text = "imageUri=$imageUri\n\n\n\npdfUri=$pdfUri"
showDocumentRenameDialog(file.name, showDocumentRenameDialog(file.name,
okAction = { okAction = {
val newFile = File(mainPresenter.getDocumentAppDir(), "$it.pdf") val child = if (it.endsWith(".pdf")) it else "$it.pdf"
val newFile = File(mainPresenter.getDocumentAppDir(), child)
mainPresenter.copyFile(file, newFile) mainPresenter.copyFile(file, newFile)
this.updateMediaStore() this.updateMediaStore()
}, },
......
...@@ -181,13 +181,29 @@ ...@@ -181,13 +181,29 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.viewpager2.widget.ViewPager2 <FrameLayout
android:id="@+id/viewPager2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/card" /> <androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager2"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/card" />
<ImageView
android:id="@+id/iv_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="24dp"
android:src="@mipmap/saoyisao"
tools:ignore="ContentDescription" />
</FrameLayout>
</LinearLayout> </LinearLayout>
...@@ -502,7 +518,7 @@ ...@@ -502,7 +518,7 @@
android:background="@drawable/bg_ffffff_10" android:background="@drawable/bg_ffffff_10"
android:gravity="center" android:gravity="center"
android:text="@string/try_using_it" android:text="@string/try_using_it"
android:textColor="#00B8DE" android:textColor="#DE202A"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_scan" app:layout_constraintStart_toStartOf="@id/tv_scan"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:textColor="#333333" android:textColor="#333333"
android:textSize="17sp" android:textSize="17sp"
...@@ -48,9 +49,10 @@ ...@@ -48,9 +49,10 @@
<TextView <TextView
android:id="@+id/tv_confirm" android:id="@+id/tv_confirm"
android:layout_width="338dp" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:background="@drawable/bg_00b8de_10" android:background="@drawable/bg_00b8de_10"
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<string name="required_permissions">Required permissions</string> <string name="required_permissions">Required permissions</string>
<string name="later">Later</string> <string name="later">Later</string>
<string name="allow">Allow</string> <string name="allow">Allow</string>
<string name="permission_tip_1">For your convenience, please allow the APP to access all your files. The document information we organize</string> <string name="permission_tip_1">For your convenience, please allow the APP to access all your files. The document information we organize </string>
<string name="permission_tip_2">will only be used on the current device.</string> <string name="permission_tip_2">will only be used on the current device.</string>
<string name="click_this_button_to_use_the_scanning_feature">Click this button to use the\nscanning feature</string> <string name="click_this_button_to_use_the_scanning_feature">Click this button to use the\nscanning feature</string>
<string name="try_using_it">Try using it</string> <string name="try_using_it">Try using it</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment