Commit ec4f099c authored by wanglei's avatar wanglei

...

parent 919e1d5f
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.main.MainActivity" android:name=".ui.main.MainActivity"
android:exported="false" android:exported="false"
......
...@@ -10,6 +10,7 @@ import com.base.scanqr.utils.KotlinExt.toFormatTime4 ...@@ -10,6 +10,7 @@ import com.base.scanqr.utils.KotlinExt.toFormatTime4
* *
*/ */
object LimitUtils { object LimitUtils {
const val NUM_DISPLAY = "local_numDisplayLimit" const val NUM_DISPLAY = "local_numDisplayLimit"
const val NUM_REQUEST = "local_numRequestLimit" const val NUM_REQUEST = "local_numRequestLimit"
......
...@@ -32,7 +32,19 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i ...@@ -32,7 +32,19 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@EmailActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -5,6 +5,7 @@ import androidx.activity.addCallback ...@@ -5,6 +5,7 @@ import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.EmailUIBean import com.base.scanqr.bean.EmailUIBean
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL
...@@ -81,7 +82,19 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo ...@@ -81,7 +82,19 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@EmailCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
package com.base.scanqr.ui.main package com.base.scanqr.ui.main
import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
...@@ -10,12 +11,15 @@ import com.base.scanqr.base.BaseFragment ...@@ -10,12 +11,15 @@ import com.base.scanqr.base.BaseFragment
import com.base.scanqr.bean.EmailUIBean import com.base.scanqr.bean.EmailUIBean
import com.base.scanqr.databinding.FragmentSettingsBinding import com.base.scanqr.databinding.FragmentSettingsBinding
import com.base.scanqr.ui.language.LanguageActivity import com.base.scanqr.ui.language.LanguageActivity
import com.base.scanqr.ui.widget.RateDialog.showRateDialog
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.IntentUtils
import com.base.scanqr.utils.IntentUtils.intentSendEmail import com.base.scanqr.utils.IntentUtils.intentSendEmail
import com.base.scanqr.utils.ToastUtils.toast import com.base.scanqr.utils.ToastUtils.toast
class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsBinding::inflate) { class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsBinding::inflate) {
@SuppressLint("SetTextI18n")
override fun initView() { override fun initView() {
super.initView() super.initView()
binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight()) binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight())
...@@ -50,5 +54,18 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB ...@@ -50,5 +54,18 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB
val activity = requireActivity() as MainActivity? val activity = requireActivity() as MainActivity?
activity?.startActivity(Intent(activity, LanguageActivity::class.java)) activity?.startActivity(Intent(activity, LanguageActivity::class.java))
} }
binding.llRate.setOnClickListener {
requireContext().showRateDialog()
}
binding.llShare.setOnClickListener {
try {
val uri = "https://play.google.com/store/apps/details?id=" + requireContext().packageName
val intent = IntentUtils.intentShareText(uri)
(requireActivity() as MainActivity?)?.startActivity(intent)
} catch (e: Exception) {
requireContext().toast("No application was found to handle the share", true)
}
}
} }
} }
\ No newline at end of file
...@@ -9,6 +9,7 @@ import androidx.activity.addCallback ...@@ -9,6 +9,7 @@ import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.ProductUIBean import com.base.scanqr.bean.ProductUIBean
...@@ -77,7 +78,19 @@ class ProductCodeActivity : BaseActivity<ActivityProductCodeBinding>(ActivityPro ...@@ -77,7 +78,19 @@ class ProductCodeActivity : BaseActivity<ActivityProductCodeBinding>(ActivityPro
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@ProductCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -5,6 +5,7 @@ import androidx.activity.addCallback ...@@ -5,6 +5,7 @@ import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.TextUIBean import com.base.scanqr.bean.TextUIBean
import com.base.scanqr.databinding.ActivityTextBinding import com.base.scanqr.databinding.ActivityTextBinding
...@@ -30,7 +31,19 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl ...@@ -30,7 +31,19 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@TextActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -9,6 +9,7 @@ import androidx.activity.addCallback ...@@ -9,6 +9,7 @@ import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.ScanBean import com.base.scanqr.bean.ScanBean
...@@ -73,7 +74,19 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB ...@@ -73,7 +74,19 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@TextCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -7,6 +7,7 @@ import androidx.activity.addCallback ...@@ -7,6 +7,7 @@ import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.WebsiteUIBean import com.base.scanqr.bean.WebsiteUIBean
import com.base.scanqr.databinding.ActivityWebsiteBinding import com.base.scanqr.databinding.ActivityWebsiteBinding
...@@ -34,7 +35,19 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind ...@@ -34,7 +35,19 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@WebsiteActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -6,6 +6,7 @@ import androidx.core.view.updatePadding ...@@ -6,6 +6,7 @@ import androidx.core.view.updatePadding
import com.base.scanqr.BuildConfig import com.base.scanqr.BuildConfig
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.WebsiteUIBean import com.base.scanqr.bean.WebsiteUIBean
...@@ -70,7 +71,19 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb ...@@ -70,7 +71,19 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMainTop() AdsMgr.showInsert(this@WebsiteCodeActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -6,7 +6,6 @@ import android.content.Intent ...@@ -6,7 +6,6 @@ import android.content.Intent
import android.net.Uri import android.net.Uri
import android.view.Gravity import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.widget.LinearLayout
import com.base.scanqr.R import com.base.scanqr.R
import com.base.scanqr.databinding.DialogRateStarBinding import com.base.scanqr.databinding.DialogRateStarBinding
import com.base.scanqr.utils.AppPreferences import com.base.scanqr.utils.AppPreferences
...@@ -47,7 +46,7 @@ object RateDialog { ...@@ -47,7 +46,7 @@ object RateDialog {
setStar(binding, index) setStar(binding, index)
} }
} }
binding.tvCancel.setOnClickListener { binding.ivClose.setOnClickListener {
dialog.dismiss() dialog.dismiss()
} }
binding.tvRate.setOnClickListener { binding.tvRate.setOnClickListener {
......
...@@ -53,7 +53,7 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl ...@@ -53,7 +53,7 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
AdsMgr.showInsert(this@WifiActivity,false,object : AdsShowCallBack() { AdsMgr.showInsert(this@WifiActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
finishToMainTop() finishToMainTop()
} }
...@@ -146,26 +146,10 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl ...@@ -146,26 +146,10 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl
toast("Enter password wifi", true) toast("Enter password wifi", true)
return@setOnClickListener return@setOnClickListener
} }
AdsMgr.showInsert(this, false, object : AdsShowCallBack() {
override fun close(where: Int) {
startActivity(Intent(this@WifiActivity, WifiCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(currentWifi))
})
}
override fun failed(where: Int) {
startActivity(Intent(this@WifiActivity, WifiCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(currentWifi))
})
}
override fun googleFailed(where: Int) { startActivity(Intent(this@WifiActivity, WifiCodeActivity::class.java).apply {
startActivity(Intent(this@WifiActivity, WifiCodeActivity::class.java).apply { putExtra("data", Gson().toJson(currentWifi))
putExtra("data", Gson().toJson(currentWifi))
})
}
}) })
} }
binding.switchHidden.setOnCheckedChangeListener { buttonView, isChecked -> binding.switchHidden.setOnCheckedChangeListener { buttonView, isChecked ->
currentWifi.hidden = isChecked currentWifi.hidden = isChecked
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@drawable/bg_ffffff_10"> android:background="@drawable/bg_ffffff_10">
<ImageView <ImageView
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
android:src="@mipmap/icon_close" android:src="@mipmap/icon_close"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription,ImageContrastCheck" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/your_opinion_matters_to_us" android:text="@string/your_opinion_matters_to_us"
android:textColor="#666666" /> android:textColor="#666666"
android:textSize="16sp" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -51,10 +52,10 @@ ...@@ -51,10 +52,10 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:id="@+id/ll_star" android:id="@+id/ll_star"
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_marginTop="20dp"> android:layout_marginTop="20dp">
<ImageView <ImageView
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:src="@mipmap/xing_s" android:src="@mipmap/xing_s"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription,ImageContrastCheck" />
<ImageView <ImageView
android:id="@+id/iv_2" android:id="@+id/iv_2"
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:src="@mipmap/xing_s" android:src="@mipmap/xing_s"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription,ImageContrastCheck" />
<ImageView <ImageView
android:id="@+id/iv_3" android:id="@+id/iv_3"
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:src="@mipmap/xing_s" android:src="@mipmap/xing_s"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription,ImageContrastCheck" />
<ImageView <ImageView
android:id="@+id/iv_4" android:id="@+id/iv_4"
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:src="@mipmap/xing_s" android:src="@mipmap/xing_s"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription,ImageContrastCheck" />
<ImageView <ImageView
android:id="@+id/iv_5" android:id="@+id/iv_5"
...@@ -95,19 +96,22 @@ ...@@ -95,19 +96,22 @@
android:layout_height="38dp" android:layout_height="38dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:src="@mipmap/xing_s" android:src="@mipmap/xing_s"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription,ImageContrastCheck" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/tvRate"
android:layout_width="303dp" android:layout_width="303dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:background="@drawable/bg_6473f8_90" android:background="@drawable/bg_6473f8_90"
android:gravity="center" android:gravity="center"
android:text="@string/rate_now" android:text="@string/rate_now"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp"
tools:ignore="TextContrastCheck" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -244,10 +244,11 @@ ...@@ -244,10 +244,11 @@
<!--评分--> <!--评分-->
<LinearLayout <LinearLayout
android:id="@+id/llRate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="visible">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -352,10 +353,11 @@ ...@@ -352,10 +353,11 @@
<!--分享--> <!--分享-->
<LinearLayout <LinearLayout
android:id="@+id/llShare"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="visible">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
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