Commit face93f4 authored by wanglei's avatar wanglei

初始化

parent da83a314
...@@ -14,7 +14,7 @@ android { ...@@ -14,7 +14,7 @@ android {
compileSdk = 34 compileSdk = 34
defaultConfig { defaultConfig {
applicationId = "com.base.pdfreader2" applicationId = "com.ttesst.gododo.redause"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 1 versionCode = 1
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"client_info": { "client_info": {
"mobilesdk_app_id": "1:953792647345:android:c5234e8bfc859f8b20d290", "mobilesdk_app_id": "1:953792647345:android:c5234e8bfc859f8b20d290",
"android_client_info": { "android_client_info": {
"package_name": "com.base.pdfreader2" "package_name": "com.ttesst.gododo.redause"
} }
}, },
"oauth_client": [], "oauth_client": [],
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application <application
android:name=".helper.MyApplication" android:name=".helper.MyApplication"
...@@ -15,10 +18,11 @@ ...@@ -15,10 +18,11 @@
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/logo" android:icon="@mipmap/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.PdfReader2" android:theme="@style/Theme.PdfReader2"
tools:targetApi="31"> tools:targetApi="34">
<activity <activity
android:name=".ui.splash.SplashActivity" android:name=".ui.splash.SplashActivity"
...@@ -152,6 +156,9 @@ ...@@ -152,6 +156,9 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" /> tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<service
android:name=".service.StayNotificationService"
android:foregroundServiceType="dataSync" />
<service <service
android:name=".fcm.MessagingService" android:name=".fcm.MessagingService"
android:exported="false"> android:exported="false">
......
...@@ -403,7 +403,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -403,7 +403,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
binding.flTool.visibility = View.VISIBLE binding.flTool.visibility = View.VISIBLE
} }
private fun initViewPager2() { private fun initViewPager2() {
pageAdapter = object : FragmentStateAdapter(this) { pageAdapter = object : FragmentStateAdapter(this) {
override fun getItemCount(): Int { override fun getItemCount(): Int {
......
...@@ -9,9 +9,9 @@ import androidx.activity.addCallback ...@@ -9,9 +9,9 @@ import androidx.activity.addCallback
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.pdfreader2.R import com.base.pdfreader2.R
import com.base.pdfreader2.bean.ConstObject
import com.base.pdfreader2.databinding.ActivityPermissionBinding import com.base.pdfreader2.databinding.ActivityPermissionBinding
import com.base.pdfreader2.helper.BaseActivity import com.base.pdfreader2.helper.BaseActivity
import com.base.pdfreader2.helper.MyApplication
import com.base.pdfreader2.utils.BarUtils import com.base.pdfreader2.utils.BarUtils
import com.base.pdfreader2.utils.PermissionUtils.requestStoragePermission import com.base.pdfreader2.utils.PermissionUtils.requestStoragePermission
import java.util.Locale import java.util.Locale
...@@ -26,7 +26,8 @@ class PermissionActivity : BaseActivity<ActivityPermissionBinding>() { ...@@ -26,7 +26,8 @@ class PermissionActivity : BaseActivity<ActivityPermissionBinding>() {
override fun initView() { override fun initView() {
val englishLanguageCountry = Locale.ENGLISH.language + "_" + Locale.ENGLISH.country val englishLanguageCountry = Locale.ENGLISH.language + "_" + Locale.ENGLISH.country
if (ConstObject.appLanguageSp != englishLanguageCountry) { if (MyApplication.setLanguage != englishLanguageCountry) {
MyApplication.setLanguage = englishLanguageCountry
changeActivityLanguage(englishLanguageCountry) changeActivityLanguage(englishLanguageCountry)
return return
} }
......
...@@ -430,13 +430,38 @@ ...@@ -430,13 +430,38 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/fl_banner"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/white"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_bottom">
<View
android:layout_width="wrap_content"
android:layout_height="1.5dp"
android:background="#D2D2D2" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:src="@mipmap/zhanweitu2"
android:tag="zhanweitu"
tools:ignore="ContentDescription" />
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/fl_scan_guide" android:id="@+id/fl_scan_guide"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/fl_banner"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
...@@ -499,31 +524,6 @@ ...@@ -499,31 +524,6 @@
</FrameLayout> </FrameLayout>
<LinearLayout
android:id="@+id/fl_banner"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/white"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_bottom">
<View
android:layout_width="wrap_content"
android:layout_height="1.5dp"
android:background="#D2D2D2" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:src="@mipmap/zhanweitu2"
android:tag="zhanweitu"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_search" android:id="@+id/ll_search"
android:layout_width="match_parent" android:layout_width="match_parent"
......
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