Commit b27fe8f3 authored by wanglei's avatar wanglei

...

parent edd45950
...@@ -4,10 +4,7 @@ ...@@ -4,10 +4,7 @@
<uses-feature <uses-feature
android:name="android.hardware.camera" android:name="android.hardware.camera"
android:required="false" /> android:required="false" /> <!-- 获取wifi列表 -->
<!-- 获取wifi列表 -->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
...@@ -15,10 +12,7 @@ ...@@ -15,10 +12,7 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" /> <!-- 前台服务 -->
<!-- 前台服务 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<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" />
...@@ -34,8 +28,9 @@ ...@@ -34,8 +28,9 @@
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=".ui.event.EventActivity"
android:exported="false" />
<activity <activity
android:name=".ui.start.StartActivity" android:name=".ui.start.StartActivity"
android:exported="true" android:exported="true"
...@@ -49,7 +44,6 @@ ...@@ -49,7 +44,6 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.main.MainActivity" android:name=".ui.main.MainActivity"
android:exported="false" android:exported="false"
...@@ -181,7 +175,6 @@ ...@@ -181,7 +175,6 @@
android:exported="false" android:exported="false"
android:foregroundServiceType="dataSync" android:foregroundServiceType="dataSync"
android:permission="android.permission.BIND_JOB_SERVICE" /> android:permission="android.permission.BIND_JOB_SERVICE" />
<service <service
android:name=".fcm.MessagingService" android:name=".fcm.MessagingService"
android:exported="false"> android:exported="false">
......
package com.base.scanqr.bean
//BEGIN:VEVENT
//SUMMARY:xxx
//DTSTART:20241230T072300
//DTEND:20241231T072300
//LOCATION:xxxx
//DESCRIPTION:xxxx
//END:VEVENT
data class EventUIBean(
val summary: String = "",
val dtstart: String = "",
val dtend: String = "",
val location: String = "",
val description: String = ""
) : ScanBean(FunctionUIBean.KEY_EVENT)
\ No newline at end of file
package com.base.scanqr.ui.event
import androidx.activity.addCallback
import androidx.core.view.updatePadding
import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.EventUIBean
import com.base.scanqr.databinding.ActivityEventBinding
import com.base.scanqr.utils.BarUtils
class EventActivity : BaseActivity<ActivityEventBinding>(ActivityEventBinding::inflate) {
private val eventUIBean = EventUIBean()
override fun onResumeOneShoot() {
super.onResumeOneShoot()
val flag = changeLanguage()
if (flag) return
}
override fun initView() {
super.initView()
binding.clTop.updatePadding(top = BarUtils.getStatusBarHeight())
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_item)
}
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback {
AdsMgr.showInsert(this@EventActivity, false, object : AdsShowCallBack() {
override fun close(where: Int) {
finishToMainTop()
}
override fun failed(where: Int) {
finishToMainTop()
}
override fun googleFailed(where: Int) {
finishToMainTop()
}
})
}
binding.flBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
}
}
\ No newline at end of file
...@@ -9,11 +9,13 @@ import com.base.scanqr.ads.AdsShowCallBack ...@@ -9,11 +9,13 @@ import com.base.scanqr.ads.AdsShowCallBack
import com.base.scanqr.base.BaseFragment import com.base.scanqr.base.BaseFragment
import com.base.scanqr.bean.FunctionUIBean import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EVENT
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_TEXT import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_TEXT
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WEBSITE import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WEBSITE
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WIFI import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_WIFI
import com.base.scanqr.databinding.FragmentCreateBinding import com.base.scanqr.databinding.FragmentCreateBinding
import com.base.scanqr.ui.email.EmailActivity import com.base.scanqr.ui.email.EmailActivity
import com.base.scanqr.ui.event.EventActivity
import com.base.scanqr.ui.text.TextActivity import com.base.scanqr.ui.text.TextActivity
import com.base.scanqr.ui.website.WebsiteActivity import com.base.scanqr.ui.website.WebsiteActivity
import com.base.scanqr.ui.wifi.WifiActivity import com.base.scanqr.ui.wifi.WifiActivity
...@@ -37,7 +39,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -37,7 +39,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
FunctionUIBean(KEY_TEXT, R.mipmap.h_text, resources.getString(R.string.text)), FunctionUIBean(KEY_TEXT, R.mipmap.h_text, resources.getString(R.string.text)),
FunctionUIBean(KEY_EMAIL, R.mipmap.h_email, resources.getString(R.string.email)), FunctionUIBean(KEY_EMAIL, R.mipmap.h_email, resources.getString(R.string.email)),
FunctionUIBean(KEY_WEBSITE, R.mipmap.h_website, resources.getString(R.string.website)), FunctionUIBean(KEY_WEBSITE, R.mipmap.h_website, resources.getString(R.string.website)),
// FunctionUIBean(KEY_EVENT, R.mipmap.h_event, resources.getString(R.string.event)), FunctionUIBean(KEY_EVENT, R.mipmap.h_event, resources.getString(R.string.event)),
// FunctionUIBean(KEY_CONTACT, R.mipmap.h_contact, resources.getString(R.string.contact)), // FunctionUIBean(KEY_CONTACT, R.mipmap.h_contact, resources.getString(R.string.contact)),
// FunctionUIBean(KEY_LOCATION, R.mipmap.h_loction, resources.getString(R.string.location)), // FunctionUIBean(KEY_LOCATION, R.mipmap.h_loction, resources.getString(R.string.location)),
// FunctionUIBean(KEY_TELEPHONE, R.mipmap.h_telephone, resources.getString(R.string.telephone)), // FunctionUIBean(KEY_TELEPHONE, R.mipmap.h_telephone, resources.getString(R.string.telephone)),
...@@ -82,6 +84,10 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -82,6 +84,10 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
KEY_WEBSITE -> { KEY_WEBSITE -> {
startActivity(Intent(requireContext(), WebsiteActivity::class.java)) startActivity(Intent(requireContext(), WebsiteActivity::class.java))
} }
KEY_EVENT -> {
startActivity(Intent(requireContext(), EventActivity::class.java))
}
} }
} }
......
This diff is collapsed.
...@@ -80,4 +80,14 @@ ...@@ -80,4 +80,14 @@
<string name="your_opinion_matters_to_us">Your opinion matters to us</string> <string name="your_opinion_matters_to_us">Your opinion matters to us</string>
<string name="rate_now">Rate now</string> <string name="rate_now">Rate now</string>
<string name="event_name">Event name</string>
<string name="enter_your_event_location">Enter your event location</string>
<string name="enter_your_event_name">Enter event name</string>
<string name="description">Description</string>
<string name="let_people_know_more_about_the_event">Let people know more about the event</string>
<string name="begin_time">Begin Time</string>
<string name="end_time">End Time</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