Commit 758e5ac2 authored by wanglei's avatar wanglei

...

parent 103d3dbe
...@@ -40,24 +40,7 @@ ...@@ -40,24 +40,7 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.ScanQR" android:theme="@style/Theme.ScanQR"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".qr.QrResultsActivity"
android:exported="false" />
<activity
android:name=".ui.insqr.InsActivity"
android:exported="false" />
<activity
android:name=".ui.whatsappqr.AreaCodeActivity"
android:exported="false" />
<activity
android:name=".qr.QrStyleResultActivity"
android:exported="false" />
<activity
android:name=".qr.QrStyleActivity"
android:exported="false" />
<activity
android:name=".ui.earthquake.EarthquakeActivity"
android:exported="false" />
<activity <activity
android:name=".ui.start.StartActivity" android:name=".ui.start.StartActivity"
android:exported="true" android:exported="true"
...@@ -240,7 +223,36 @@ ...@@ -240,7 +223,36 @@
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" /> tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".ui.scan.ScanOtherActivity"
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".qr.QrResultsActivity"
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".ui.whatsappqr.AreaCodeActivity"
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".qr.QrStyleResultActivity"
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".qr.QrStyleActivity"
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".ui.earthquake.EarthquakeActivity"
android:exported="false"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
...@@ -343,6 +355,7 @@ ...@@ -343,6 +355,7 @@
<meta-data <meta-data
android:name="com.facebook.sdk.ApplicationId" android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" /> android:value="@string/facebook_app_id" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
...@@ -23,6 +23,10 @@ class FunctionUIBean( ...@@ -23,6 +23,10 @@ class FunctionUIBean(
const val KEY_MESSAGE = "key_message" const val KEY_MESSAGE = "key_message"
const val KEY_PRODUCT = "key_product" const val KEY_PRODUCT = "key_product"
const val KEY_FOOD = "key_food" const val KEY_FOOD = "key_food"
const val KEY_COIN = "key_coin"
const val KEY_BANKNOTE = "key_banknote"
const val KEY_DOCUMENT = "key_document"
const val KEY_BUSINESS_CARD = "key_business_card"
const val KEY_WHATSAPP = "key_whatsapp" const val KEY_WHATSAPP = "key_whatsapp"
const val KEY_YOUTUBE = "key_youtube" const val KEY_YOUTUBE = "key_youtube"
......
...@@ -42,6 +42,7 @@ import com.base.scanqrclear.ui.facebookqr.FacebookDialog.showFacebookDialog ...@@ -42,6 +42,7 @@ import com.base.scanqrclear.ui.facebookqr.FacebookDialog.showFacebookDialog
import com.base.scanqrclear.ui.insqr.InstagramDialog.showInstagramDialog import com.base.scanqrclear.ui.insqr.InstagramDialog.showInstagramDialog
import com.base.scanqrclear.ui.message.MessageActivity import com.base.scanqrclear.ui.message.MessageActivity
import com.base.scanqrclear.ui.paypalqr.PaypalDialog.showPaypalDialog import com.base.scanqrclear.ui.paypalqr.PaypalDialog.showPaypalDialog
import com.base.scanqrclear.ui.scan.ScanOtherActivity
import com.base.scanqrclear.ui.spotifyqr.SpotifyDialog.showSpotifyDialog import com.base.scanqrclear.ui.spotifyqr.SpotifyDialog.showSpotifyDialog
import com.base.scanqrclear.ui.telephone.TelephoneActivity import com.base.scanqrclear.ui.telephone.TelephoneActivity
import com.base.scanqrclear.ui.text.TextActivity import com.base.scanqrclear.ui.text.TextActivity
...@@ -204,9 +205,11 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -204,9 +205,11 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
} }
when (key) { when (key) {
KEY_SCAN -> { KEY_SCAN -> {
startActivity(Intent(requireContext(), ScanAc::class.java)) // startActivity(Intent(requireContext(), ScanAc::class.java))
startActivity(Intent(requireContext(), ScanOtherActivity::class.java))
} }
KEY_WIFI -> { KEY_WIFI -> {
startActivity(Intent(requireContext(), WifiActivity::class.java)) startActivity(Intent(requireContext(), WifiActivity::class.java))
} }
......
package com.base.scanqrclear.ui.scan
import androidx.core.view.updatePadding
import com.base.scanqrclear.R
import com.base.scanqrclear.base.BaseActivity
import com.base.scanqrclear.bean.FunctionUIBean
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_BANKNOTE
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_BUSINESS_CARD
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_COIN
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_DOCUMENT
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_FOOD
import com.base.scanqrclear.databinding.ActivityScanOtherBinding
import com.base.scanqrclear.utils.BarUtils
import com.gyf.immersionbar.ktx.immersionBar
class ScanOtherActivity : BaseActivity<ActivityScanOtherBinding>(ActivityScanOtherBinding::inflate) {
override fun initView() {
super.initView()
binding.clTop.updatePadding(top = BarUtils.getStatusBarHeight())
}
override fun initListener() {
super.initListener()
val adapter = ScanOtherAdapter()
binding.rv.adapter = adapter
adapter.submitList(
listOf(
FunctionUIBean(KEY_FOOD, R.mipmap.foodscan, getString(R.string.food_scan)),
FunctionUIBean(KEY_COIN, R.mipmap.coinscan, getString(R.string.coin_scan)),
FunctionUIBean(KEY_BANKNOTE, R.mipmap.banknote, getString(R.string.banknote_scan)),
FunctionUIBean(KEY_DOCUMENT, R.mipmap.document, getString(R.string.document_scan)),
FunctionUIBean(KEY_BUSINESS_CARD, R.mipmap.business, getString(R.string.business_card))
),
)
adapter.itemClick = { item ->
when (item.key) {
}
}
}
override fun configSystemBar() {
immersionBar {
statusBarColor("#FFFFFFFF")
statusBarDarkFont(false)
}
}
}
\ No newline at end of file
package com.base.scanqrclear.ui.scan
import android.content.Context
import android.view.ViewGroup
import com.base.scanqrclear.R
import com.base.scanqrclear.bean.FunctionUIBean
import com.base.scanqrclear.databinding.ItemScanBinding
import com.base.scanqrclear.ui.adapter.CommonViewHolder
import com.base.scanqrclear.utils.XmlEx.inflate
import com.chad.library.adapter4.BaseQuickAdapter
class ScanOtherAdapter : BaseQuickAdapter<FunctionUIBean, CommonViewHolder>() {
var itemClick: ((item: FunctionUIBean) -> Unit)? = null
override fun onBindViewHolder(holder: CommonViewHolder, position: Int, item: FunctionUIBean?) {
item ?: return
val binding = ItemScanBinding.bind(holder.itemView)
binding.iv.setImageResource(item.icon)
binding.tv.text = item.desc
binding.root.setOnClickListener {
itemClick?.invoke(item)
}
}
override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): CommonViewHolder {
return CommonViewHolder(R.layout.item_scan.inflate(parent))
}
}
\ No newline at end of file
...@@ -37,7 +37,7 @@ object OpenFoodDialog { ...@@ -37,7 +37,7 @@ object OpenFoodDialog {
binding.tvName.text = openFoodBean.product_name binding.tvName.text = openFoodBean.product_name
var grade = "NA" var grade = "NA"
var gradeDesc = "NA" var gradeDesc = "NA"
var gradeImage = R.mipmap.grade_a var gradeImage = R.mipmap.grade_na
if ( if (
openFoodBean.nutriscore_grade?.contains("A") == true || openFoodBean.nutriscore_grade?.contains("A") == true ||
openFoodBean.nutriscore_grade?.contains("a") == true openFoodBean.nutriscore_grade?.contains("a") == true
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<stroke
android:width="1dp"
android:color="#E4E4E4" />
<corners android:radius="20dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.scan.ScanOtherActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/fanhui"
tools:ignore="ContentDescription" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/scan"
android:textColor="@color/black"
android:textSize="19sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/fl_back"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintTop_toBottomOf="@id/cl_top"
app:spanCount="2"
tools:listitem="@layout/item_scan" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bg_stroke_e4e4e4_20"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="6dp"
android:orientation="vertical"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"
android:src="@mipmap/foodscan"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="18dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:ignore="HardcodedText"
tools:text="Food Scan" />
</LinearLayout>
\ No newline at end of file
...@@ -284,5 +284,10 @@ ...@@ -284,5 +284,10 @@
<string name="please_enter_longitude">Please enter longitude</string> <string name="please_enter_longitude">Please enter longitude</string>
<string name="latitude">Latitude</string> <string name="latitude">Latitude</string>
<string name="please_enter_latitude">Please enter latitude</string> <string name="please_enter_latitude">Please enter latitude</string>
<string name="food_scan">Food Scan</string>
<string name="coin_scan">Coin Scan</string>
<string name="banknote_scan">Banknote Scan</string>
<string name="document_scan">Document Scan</string>
<string name="business_card">Business card</string>
</resources> </resources>
\ No newline at end of file
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