一键连新增 首页ui
This commit is contained in:
parent
94857245d9
commit
8dca2e837d
|
|
@ -19,6 +19,11 @@
|
|||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
|
||||
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
<application
|
||||
android:name=".app.MainApplication"
|
||||
android:fullBackupContent="@xml/full_backup_content"
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ class MainActivity : BaseActivity() {
|
|||
private var activityDialog: ActivityViewDialog? = null
|
||||
private var checkPayResultDia: MaterialDialog? = null
|
||||
private var checkBindAccountDia: MaterialDialog? = null
|
||||
private var currentTag = TAG_HOME
|
||||
|
||||
private val mPageInfo = ExpensesRecordActivity.PageInfo()
|
||||
companion object {
|
||||
|
|
@ -117,10 +116,6 @@ class MainActivity : BaseActivity() {
|
|||
var newMainActGlo: Boolean = false
|
||||
var newUuid: String? = null
|
||||
var clashBinder: IClashManager? = null
|
||||
|
||||
private const val TAG_HOME = "home"
|
||||
private const val TAG_PROFILE = "profile"
|
||||
private const val TAG_RECHARGE = "recharge"
|
||||
suspend fun setSub2(url: String) {
|
||||
profileBinder?.let { pm ->
|
||||
pm.queryAll().forEach { itemPro ->
|
||||
|
|
@ -218,7 +213,7 @@ class MainActivity : BaseActivity() {
|
|||
aivHome.setOnClickListener {
|
||||
if (homeFragment == null) homeFragment = HomeFragment()
|
||||
showFragment(homeFragment!!)
|
||||
aivHome.setImageResource(R.drawable.yjl_vip_page_choose)
|
||||
aivHome.setImageResource(R.drawable.yjl_home_page_choose)
|
||||
aivCenter.setImageResource(R.drawable.yjl_user_page)
|
||||
aivVip.setImageResource(R.drawable.yjl_vip_page)
|
||||
}
|
||||
|
|
@ -235,8 +230,8 @@ class MainActivity : BaseActivity() {
|
|||
if (activityFragment == null) activityFragment = vipFragment()
|
||||
showFragment(activityFragment!!)
|
||||
aivHome.setImageResource(R.drawable.yjl_home_page)
|
||||
aivCenter.setImageResource(R.drawable.yjl_vip_page)
|
||||
aivVip.setImageResource(R.drawable.yjl_user_page_choose)
|
||||
aivCenter.setImageResource(R.drawable.yjl_user_page)
|
||||
aivVip.setImageResource(R.drawable.yjl_vip_page_choose)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -304,12 +299,13 @@ class MainActivity : BaseActivity() {
|
|||
data.data.data.list[0].redirectLink.let {
|
||||
if (activityDialog == null) {
|
||||
activityDialog =
|
||||
ActivityViewDialog(this, data.data.data.list[0].redirectLink)
|
||||
ActivityViewDialog(this, data.data.data.list[0].copyContent)
|
||||
activityDialog?.setOnDialogClickListener(object :
|
||||
OnDialogClickListener {
|
||||
override fun onRechargeClickListener() {
|
||||
//跳转到支付界面
|
||||
goBackupRechargeWeb()
|
||||
activityDialog?.dismiss()
|
||||
}
|
||||
|
||||
override fun onCancelClickListener() {
|
||||
|
|
@ -362,7 +358,7 @@ class MainActivity : BaseActivity() {
|
|||
val data = it.data
|
||||
if (data?.notice != null && lastNotice != data.notice) {
|
||||
|
||||
val userName ="AAA"+MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME)
|
||||
val userName =MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME)
|
||||
android.util.Log.i("data::::","notice::"+data.notice)
|
||||
if(data.notice.isEmpty()){
|
||||
val homeNoticeDialog = NoticeViewDialog(this@MainActivity, "暂无新通知",userName)
|
||||
|
|
@ -726,9 +722,14 @@ class MainActivity : BaseActivity() {
|
|||
}
|
||||
|
||||
fun goBackupRechargeWeb() {
|
||||
startActivityForResult(
|
||||
Intent(this@MainActivity, MemberRechargeActivity::class.java),
|
||||
REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY
|
||||
)
|
||||
if (activityFragment == null) activityFragment = vipFragment()
|
||||
showFragment(activityFragment!!)
|
||||
aivHome.setImageResource(R.drawable.yjl_home_page)
|
||||
aivCenter.setImageResource(R.drawable.yjl_vip_page)
|
||||
aivVip.setImageResource(R.drawable.yjl_user_page_choose)
|
||||
// startActivityForResult(
|
||||
// Intent(this@MainActivity, MemberRechargeActivity::class.java),
|
||||
// REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY
|
||||
// )
|
||||
}
|
||||
}
|
||||
|
|
@ -76,6 +76,7 @@ class SettingActivity : BaseActivity() {
|
|||
private lateinit var clFowdPsw:ConstraintLayout
|
||||
private lateinit var clDeletePsw:ConstraintLayout
|
||||
private lateinit var tvExit:TextView
|
||||
private lateinit var aiBack:AppCompatImageView
|
||||
|
||||
private lateinit var mainAtyVM: MainAtyVM
|
||||
@RequiresApi(Build.VERSION_CODES.R)
|
||||
|
|
@ -99,7 +100,10 @@ class SettingActivity : BaseActivity() {
|
|||
clFowdPsw=findViewById(R.id.clFowdPsw)
|
||||
clDeletePsw=findViewById(R.id.clDeletePsw)
|
||||
tvExit=findViewById(R.id.tvExit)
|
||||
|
||||
aiBack=findViewById(R.id.aiBack)
|
||||
aiBack.setOnClickListener {
|
||||
finish()
|
||||
}
|
||||
clChanPsw.setOnClickListener {
|
||||
startActivity(Intent(this@SettingActivity, ChangePwdActivity::class.java))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import java.util.HashSet
|
|||
|
||||
|
||||
abstract class BaseFragment :Fragment() {
|
||||
var baseLoading: RxDialogShapeLoading? = null
|
||||
override fun onCreateView(
|
||||
inflater: LayoutInflater,
|
||||
container: ViewGroup?,
|
||||
|
|
@ -68,21 +67,6 @@ abstract class BaseFragment :Fragment() {
|
|||
open fun httpSuccess(httpStatus: HttpStatus.Success){}
|
||||
|
||||
open fun httpFailure(httpStatus: HttpStatus.Failure){}
|
||||
fun showLoading(str: String, context: Context) {
|
||||
val message = if (TextUtils.isEmpty(str)) "进行中..." else str
|
||||
if (baseLoading == null) {
|
||||
baseLoading = RxDialogShapeLoading(context)
|
||||
}
|
||||
baseLoading?.setMessage(message)
|
||||
if (baseLoading?.isShowing == false) {
|
||||
baseLoading?.show()
|
||||
}
|
||||
}
|
||||
fun hideLoading() {
|
||||
if (baseLoading != null && baseLoading?.isShowing == true) {
|
||||
baseLoading?.cancel()
|
||||
}
|
||||
}
|
||||
@Synchronized
|
||||
fun switchServer2(): Boolean {
|
||||
var isChange = false
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ import kotlin.coroutines.suspendCoroutine
|
|||
|
||||
open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatchers.IO){
|
||||
companion object {
|
||||
const val REQUEST_CONNECT = 1
|
||||
const val CHECK_NODE_REQUEST_CODE = 2
|
||||
const val CLASH_STARTED = 11
|
||||
const val CLASH_STARTING = 22
|
||||
|
|
@ -292,7 +291,7 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
|||
}
|
||||
return@setOnClickListener
|
||||
}
|
||||
showLoad(resources.getString(R.string.Starting), requireContext())
|
||||
showLoading(resources.getString(R.string.Starting), requireContext())
|
||||
startClash(true)
|
||||
}
|
||||
}
|
||||
|
|
@ -390,7 +389,7 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
|||
withContext(Dispatchers.Main) {
|
||||
tvClick.text=resources.getString(R.string.Accelerating)
|
||||
ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_select_bg)
|
||||
hideLoad()
|
||||
hideLoading()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -500,6 +499,7 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
|||
val isRunning = data?.extras?.getBoolean(BZYConstants.EXTRA_KEY_IS_RUNING)
|
||||
Log.d("onActivityResult ==>>> Node:${node}")
|
||||
node?.let {
|
||||
setNodeNameAndImg(it)
|
||||
if (clashRunning) {
|
||||
Log.d("clashRunning $clashRunning")
|
||||
} else {
|
||||
|
|
@ -515,6 +515,7 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
|||
|
||||
@Deprecated("Deprecated in Java")
|
||||
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
||||
android.util.Log.i("AAAAAAAAAAAAAAA","data:::${data}")
|
||||
if (requestCode == 2) {
|
||||
nodeChooseBase(data)
|
||||
}
|
||||
|
|
@ -839,18 +840,18 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
|||
}
|
||||
}
|
||||
|
||||
fun showLoad(str: String, context: Context) {
|
||||
fun showLoading(str: String, context: Context) {
|
||||
val message = if (TextUtils.isEmpty(str)) "进行中..." else str
|
||||
if (baseLoadingView == null) {
|
||||
baseLoadingView = RxDialogShapeLoading(context)
|
||||
}
|
||||
baseLoading?.setMessage(message)
|
||||
if (baseLoading?.isShowing == false) {
|
||||
baseLoading?.show()
|
||||
baseLoadingView?.setMessage(message)
|
||||
if (baseLoadingView?.isShowing == false) {
|
||||
baseLoadingView?.show()
|
||||
}
|
||||
}
|
||||
|
||||
fun hideLoad() {
|
||||
fun hideLoading() {
|
||||
if (baseLoadingView != null && baseLoadingView?.isShowing == true) {
|
||||
baseLoadingView?.cancel()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,22 +8,17 @@ import android.content.Intent
|
|||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.text.TextUtils
|
||||
import android.text.method.LinkMovementMethod
|
||||
import android.view.View
|
||||
import android.widget.FrameLayout
|
||||
import android.widget.ImageView
|
||||
import android.widget.RelativeLayout
|
||||
import android.widget.TextView
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.appcompat.widget.AppCompatImageView
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.recyclerview.widget.GridLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.afollestad.materialdialogs.MaterialDialog
|
||||
import com.afollestad.materialdialogs.customview.customView
|
||||
import com.afollestad.materialdialogs.customview.getCustomView
|
||||
import com.alibaba.sdk.android.oss.ClientException
|
||||
import com.alibaba.sdk.android.oss.OSSClient
|
||||
import com.alibaba.sdk.android.oss.ServiceException
|
||||
|
|
@ -34,6 +29,9 @@ import com.alibaba.sdk.android.oss.internal.OSSAsyncTask
|
|||
import com.alibaba.sdk.android.oss.model.PutObjectRequest
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult
|
||||
import com.cncat.vpn.common.log.Log
|
||||
import com.hjq.permissions.OnPermissionCallback
|
||||
import com.hjq.permissions.Permission
|
||||
import com.hjq.permissions.XXPermissions
|
||||
import com.orhanobut.logger.Logger
|
||||
import com.tencent.mmkv.MMKV
|
||||
import com.yingmao.clash.BuildConfig
|
||||
|
|
@ -42,7 +40,6 @@ import com.yingmao.clash.act.ActivityActivity
|
|||
import com.yingmao.clash.act.AgreementAndPrivacyActivity
|
||||
import com.yingmao.clash.act.BandPhoneActivity
|
||||
import com.yingmao.clash.act.MainActivity
|
||||
import com.yingmao.clash.act.MainActivity.Companion.isVip
|
||||
import com.yingmao.clash.act.MainActivity.Companion.profileBinder
|
||||
import com.yingmao.clash.act.MainActivity.Companion.setSub2
|
||||
import com.yingmao.clash.act.MainActivity.Companion.subUrl
|
||||
|
|
@ -70,7 +67,6 @@ import com.yingmao.clash.view.dialog.DialogDoMainChoose
|
|||
import com.yingmao.clash.view.dialog.NoticeViewDialog
|
||||
import com.yingmao.clash.view.dialog.RxDialogShapeLoading
|
||||
import com.yingmao.clash.vm.MainAtyVM
|
||||
import com.yingmao.clash.webview.CustomerServiceWebView
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.MainScope
|
||||
|
|
@ -83,6 +79,7 @@ import java.time.Instant
|
|||
import java.time.temporal.ChronoUnit
|
||||
import java.util.Date
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.time.Duration.Companion.seconds
|
||||
|
||||
|
||||
|
|
@ -99,7 +96,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
private lateinit var tvVersion: TextView
|
||||
private lateinit var tvUserTimeEnd: TextView
|
||||
|
||||
|
||||
private var baseLoadingView: RxDialogShapeLoading? = null
|
||||
|
||||
private lateinit var rvSettingTab:RecyclerView
|
||||
|
||||
|
|
@ -257,20 +254,6 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
|
||||
}
|
||||
6->{
|
||||
initializationRepair()
|
||||
|
||||
|
||||
}
|
||||
7->{
|
||||
|
||||
|
||||
}
|
||||
8->{
|
||||
val intent = Intent(requireContext(),AgreementAndPrivacyActivity::class.java)
|
||||
intent.putExtra(BZYConstants.EXTRA_KEY_AGREEMENT, BZYConstants.EXTRA_PRIVACY_AGREEMENT)
|
||||
startActivity(intent)
|
||||
}
|
||||
9->{
|
||||
if(clashRunning){
|
||||
RxToast.info(getString(R.string.SwitchingSource))
|
||||
}else{
|
||||
|
|
@ -278,6 +261,20 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
//源切换
|
||||
showDomainList()
|
||||
}
|
||||
|
||||
}
|
||||
7->{
|
||||
// var a=0
|
||||
// var c=1/a
|
||||
checkPermission()
|
||||
}
|
||||
8->{
|
||||
val intent = Intent(requireContext(),AgreementAndPrivacyActivity::class.java)
|
||||
intent.putExtra(BZYConstants.EXTRA_KEY_AGREEMENT, BZYConstants.EXTRA_PRIVACY_AGREEMENT)
|
||||
startActivity(intent)
|
||||
}
|
||||
9->{
|
||||
initializationRepair()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -318,7 +315,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
"resultData:$result"
|
||||
)
|
||||
withContext(Dispatchers.Main){
|
||||
hideLoad()
|
||||
hideLoading()
|
||||
RxToast.error(resources.getString(R.string.FixTimeout))
|
||||
}
|
||||
}else{
|
||||
|
|
@ -327,7 +324,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
"resultData:$result"
|
||||
)
|
||||
withContext(Dispatchers.Main){
|
||||
hideLoad()
|
||||
hideLoading()
|
||||
RxToast.info(resources.getString(R.string.RepairCompletedInit))
|
||||
}
|
||||
}
|
||||
|
|
@ -452,13 +449,11 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
}
|
||||
} else {
|
||||
val validPeriod = MMKV.defaultMMKV().decodeLong(BZYConstants.MMKV_KEY_VPN_VALID_PERIOD)
|
||||
val daysDifference = getDaysDifference(validPeriod)
|
||||
val daysDifference = getDaysDifferenceCalendar(validPeriod)
|
||||
if (daysDifference > 0) {
|
||||
tvEndTimes.text=daysDifference.toString()+"dat"
|
||||
} else if (daysDifference < 0) {
|
||||
tvEndTimes.text=daysDifference.toString()+"dat"
|
||||
} else {
|
||||
tvEndTimes.text=daysDifference.toString()+"dat"
|
||||
tvEndTimes.text=resources.getString(R.string.vipTimeStrEd).replace("$",
|
||||
daysDifference.toString()
|
||||
)
|
||||
}
|
||||
val decodeString = MMKV.defaultMMKV().decodeString(BZYConstants.languageInfo, "")
|
||||
if (decodeString.isNullOrEmpty()) {
|
||||
|
|
@ -612,7 +607,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
}
|
||||
|
||||
} else {
|
||||
hideLoad()
|
||||
hideLoading()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -650,13 +645,6 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
baseLoad?.show()
|
||||
}
|
||||
}
|
||||
|
||||
fun hideLoad() {
|
||||
if (baseLoad != null && baseLoad?.isShowing == true) {
|
||||
baseLoad?.cancel()
|
||||
}
|
||||
}
|
||||
|
||||
private fun uploadForAliOss(data: ParamData, filePath: List<String>, dirStr: String) {
|
||||
val endpoint = "oss-cn-hongkong.aliyuncs.com"
|
||||
val accessKeyId = data.credentials?.accessKeyId
|
||||
|
|
@ -687,7 +675,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
}
|
||||
|
||||
requireActivity().runOnUiThread {
|
||||
hideLoad()
|
||||
hideLoading()
|
||||
RxToast.info(resources.getString(R.string.LogUploadedSuccessfully))
|
||||
}
|
||||
|
||||
|
|
@ -704,7 +692,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
serviceException: ServiceException,
|
||||
) {
|
||||
requireActivity().runOnUiThread {
|
||||
hideLoad()
|
||||
hideLoading()
|
||||
RxToast.error(resources.getString(R.string.LogUploadedFiler))
|
||||
}
|
||||
// 请求异常。
|
||||
|
|
@ -747,4 +735,63 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
|||
newMain.goBackupRechargeWeb()
|
||||
}
|
||||
}
|
||||
fun showLoading(str: String, context: Context) {
|
||||
val message = if (TextUtils.isEmpty(str)) "进行中..." else str
|
||||
if (baseLoadingView == null) {
|
||||
baseLoadingView = RxDialogShapeLoading(context)
|
||||
}
|
||||
baseLoadingView?.setMessage(message)
|
||||
if (baseLoadingView?.isShowing == false) {
|
||||
baseLoadingView?.show()
|
||||
}
|
||||
}
|
||||
|
||||
fun hideLoading() {
|
||||
if (baseLoadingView != null && baseLoadingView?.isShowing == true) {
|
||||
baseLoadingView?.cancel()
|
||||
}
|
||||
}
|
||||
fun getDaysDifferenceCalendar(timestamp: Long): Long {
|
||||
val currentTime = System.currentTimeMillis()
|
||||
val diff = Math.abs(currentTime - timestamp) // 使用绝对值
|
||||
return TimeUnit.MILLISECONDS.toDays(diff)
|
||||
}
|
||||
private fun checkPermission() {
|
||||
XXPermissions.with(this)
|
||||
// 申请单个权限
|
||||
.permission(Permission.MANAGE_EXTERNAL_STORAGE)
|
||||
.permission(Permission.Group.STORAGE)
|
||||
.request(object:OnPermissionCallback{
|
||||
override fun onGranted(permissions: MutableList<String>, allGranted: Boolean) {
|
||||
if (!allGranted) {
|
||||
showLoading(resources.getString(R.string.UploadingInProgress), requireContext())
|
||||
val directory: File? = requireContext().getExternalFilesDir("CrashLog")
|
||||
if (directory != null) {
|
||||
val allFilePath = getAllFilePath(directory.path)
|
||||
if (allFilePath.isNotEmpty()) {
|
||||
mainAtyVM.getUploadParameters()
|
||||
} else {
|
||||
hideLoading()
|
||||
RxToast.info(resources.getString(R.string.NoErrorLogs))
|
||||
}
|
||||
} else {
|
||||
hideLoading()
|
||||
RxToast.error(resources.getString(R.string.ReadPermissionsDenied))
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
override fun onDenied(permissions: MutableList<String>, doNotAskAgain: Boolean) {
|
||||
if (doNotAskAgain) {
|
||||
RxToast.error(resources.getString(R.string.ReadPermissionsDenied))
|
||||
// 如果是被永久拒绝就跳转到应用权限系统设置页面
|
||||
XXPermissions.startPermissionActivity(requireContext(), permissions)
|
||||
hideLoading()
|
||||
} else {
|
||||
RxToast.error(resources.getString(R.string.ReadPermissionsDenied))
|
||||
hideLoading()
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
package com.yingmao.clash.fragment.activity
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.Color
|
||||
import android.text.TextUtils
|
||||
import android.view.View
|
||||
import android.widget.FrameLayout
|
||||
import android.widget.ImageView
|
||||
|
|
@ -89,6 +91,8 @@ class vipFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatchers
|
|||
}
|
||||
|
||||
private val mPageInfo = ExpensesRecordActivity.PageInfo()
|
||||
|
||||
private var baseLoadingView: RxDialogShapeLoading? = null
|
||||
override fun init(
|
||||
titleBarRl: RelativeLayout,
|
||||
backIv: ImageView,
|
||||
|
|
@ -528,4 +532,20 @@ class vipFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatchers
|
|||
)
|
||||
}
|
||||
}
|
||||
fun showLoading(str: String, context: Context) {
|
||||
val message = if (TextUtils.isEmpty(str)) "进行中..." else str
|
||||
if (baseLoadingView == null) {
|
||||
baseLoadingView = RxDialogShapeLoading(context)
|
||||
}
|
||||
baseLoadingView?.setMessage(message)
|
||||
if (baseLoadingView?.isShowing == false) {
|
||||
baseLoadingView?.show()
|
||||
}
|
||||
}
|
||||
|
||||
fun hideLoading() {
|
||||
if (baseLoadingView != null && baseLoadingView?.isShowing == true) {
|
||||
baseLoadingView?.cancel()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
package com.yingmao.clash.view.adapter
|
||||
|
||||
|
||||
import android.content.Intent
|
||||
import android.widget.TextView
|
||||
import com.afollestad.materialdialogs.MaterialDialog
|
||||
import com.afollestad.materialdialogs.customview.customView
|
||||
|
|
@ -12,10 +13,12 @@ import com.tencent.mmkv.MMKV
|
|||
import com.yingmao.clash.R
|
||||
import com.yingmao.clash.app.MainApplication
|
||||
import com.cncat.vpn.common.log.Log
|
||||
import com.yingmao.clash.act.MemberRechargeActivity
|
||||
import com.yingmao.clash.conf.BZYConstants
|
||||
import com.yingmao.clash.conf.PayType
|
||||
import com.yingmao.clash.listener.MyAdapterListener
|
||||
import com.yingmao.clash.net.http.entity.Activity_
|
||||
import com.yingmao.clash.util.CommonUtils
|
||||
|
||||
|
||||
class GetActivityAdapter(
|
||||
|
|
@ -27,10 +30,17 @@ class GetActivityAdapter(
|
|||
), LoadMoreModule {
|
||||
override fun convert(holder: BaseViewHolder, item: Activity_) {
|
||||
holder.setText(R.id.tv_act_title, "${item.title}")
|
||||
holder.setText(R.id.tv_act_info, context.resources.getString(R.string.ActivityContent)+"${item.content}")
|
||||
holder.setText(R.id.tv_act_info, "${item.content}")
|
||||
|
||||
holder.setText(R.id.tv_act_gift, context.resources.getString(R.string.RewardTime)+"${item.awardDay}"+context.resources.getString(R.string.day))
|
||||
holder.setText(R.id.tv_act_gift, "${item.awardDay}"+context.resources.getString(R.string.day))
|
||||
|
||||
if (item.redirectLink.contains("BindAccount")) {
|
||||
holder.setImageResource(R.id.aivActivity,R.drawable.yjl_bing_bg_icon)
|
||||
}else if(item.redirectLink.contains("weekcharge")){
|
||||
holder.setImageResource(R.id.aivActivity,R.drawable.yjl_pay_item_icon)
|
||||
}else {
|
||||
holder.setImageResource(R.id.aivActivity,R.drawable.yjl_pay_item_icon)
|
||||
}
|
||||
|
||||
holder.itemView.setOnClickListener {
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class ActivityViewDialog extends Dialog {
|
|||
ImageView ivActivityImg =findViewById(R.id.ivActivityImg);
|
||||
Glide.with(context)
|
||||
.load(path)
|
||||
// .error(R.drawable.ic_activity_bg)
|
||||
.error(R.mipmap.base_erro_activity)
|
||||
.diskCacheStrategy(DiskCacheStrategy.DATA)//仅仅只缓存原来的全分辨率的图像
|
||||
.into(ivActivityImg);
|
||||
|
||||
|
|
@ -53,6 +53,12 @@ public class ActivityViewDialog extends Dialog {
|
|||
onDialogClickListener.onCancelClickListener();
|
||||
}
|
||||
});
|
||||
|
||||
ivActivityImg.setOnClickListener(v -> {
|
||||
if (onDialogClickListener != null) {
|
||||
onDialogClickListener.onRechargeClickListener();
|
||||
}
|
||||
});
|
||||
abRecharge.setOnClickListener(v -> {
|
||||
if (onDialogClickListener != null) {
|
||||
onDialogClickListener.onRechargeClickListener();
|
||||
|
|
|
|||
|
|
@ -40,10 +40,6 @@ public class NoticeViewDialog extends Dialog {
|
|||
ImageView icActivityClose=findViewById(R.id.icActivityClose);
|
||||
TextView tvMySee=findViewById(R.id.tvMySee);
|
||||
TextView tvContent=findViewById(R.id.tv_notice_content);
|
||||
|
||||
TextView tvNewTitle=findViewById(R.id.tvNewTitle);
|
||||
|
||||
tvNewTitle.setText(userName);
|
||||
tvContent.setText(content);
|
||||
icActivityClose.setOnClickListener(v -> {
|
||||
if (onDialogClickListener != null) {
|
||||
|
|
|
|||
|
|
@ -221,4 +221,15 @@ class MainAtyVM : PublicViewMode() {
|
|||
)
|
||||
doAsync(HttpReqType.LogOutDel){httpApi.logOutDel(params)}
|
||||
}
|
||||
fun getUploadParameters() {
|
||||
val httpApi = NetService.instances.createHttps(HttpApi::class.java)
|
||||
val username =
|
||||
MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME, "")!!
|
||||
val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN, "")!!
|
||||
val params = hashMapOf(
|
||||
"phoneNumber" to username,
|
||||
"phToken" to phToken,
|
||||
)
|
||||
doAsync(HttpReqType.UploadParameters) { httpApi.getUploadParameters(params) }
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<item>
|
||||
<shape>
|
||||
<!-- 边框颜色 -->
|
||||
<solid android:color="#5A2B31" />
|
||||
<solid android:color="#fff" />
|
||||
<corners android:radius="10dp"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
android:top="0dp">
|
||||
<shape>
|
||||
<!-- View填充颜色 -->
|
||||
<solid android:color="#FFF3E5" />
|
||||
<solid android:color="#fff" />
|
||||
<corners android:radius="10dp"/>
|
||||
|
||||
</shape>
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
<item>
|
||||
<shape>
|
||||
<!-- 边框颜色 -->
|
||||
<solid android:color="#5A2B31"/>
|
||||
<corners android:radius="16dp"/>
|
||||
<solid android:color="#FFFFFFFF"/>
|
||||
<corners android:radius="14dp"/>
|
||||
</shape>
|
||||
</item>
|
||||
<!-- 给View的上 左 右设置8dp的边框 -->
|
||||
<item android:top="0dp" android:left="0dp" android:right="3dp" android:bottom="3dp" >
|
||||
<item android:top="0dp" android:left="0dp" android:right="0dp" android:bottom="0dp" >
|
||||
<shape>
|
||||
<!-- View填充颜色 -->
|
||||
<solid android:color="#FFDBB2" />
|
||||
<corners android:radius="16dp"/>
|
||||
<solid android:color="#FFFFFFFF" />
|
||||
<corners android:radius="14dp"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="38dp"
|
||||
android:height="38dp"
|
||||
android:viewportWidth="38"
|
||||
android:viewportHeight="38">
|
||||
<path
|
||||
android:pathData="M37.911,35.357C37.911,34.402 30.102,33.618 20.483,33.618C10.85,33.618 3.055,34.402 3.055,35.357C3.055,36.326 10.85,37.109 20.483,37.109C30.102,37.109 37.911,36.326 37.911,35.357Z"
|
||||
android:fillColor="#E7E0BC"/>
|
||||
<path
|
||||
android:pathData="M24.496,24.356C24.496,26.057 25.171,27.688 26.374,28.89C27.576,30.093 29.207,30.768 30.908,30.768C32.609,30.768 34.24,30.093 35.442,28.89C36.645,27.688 37.321,26.057 37.321,24.356C37.321,22.655 36.645,21.024 35.442,19.822C34.24,18.619 32.609,17.943 30.908,17.943C29.207,17.943 27.576,18.619 26.374,19.822C25.171,21.024 24.496,22.655 24.496,24.356Z"
|
||||
android:fillColor="#FFE9AC"/>
|
||||
<path
|
||||
android:pathData="M26.273,4.739C26.194,3.979 26.355,3.214 26.733,2.55C27.111,1.886 27.688,1.358 28.382,1.038C29.909,0.326 31.713,0.728 32.756,2.007C33.801,3.29 33.815,5.121 32.791,6.449L35.943,18.485C36.681,21.292 35.262,24.247 32.58,25.496L20.201,31.268C17.446,32.551 14.187,31.656 12.551,29.168L6.016,19.217C4.369,19.454 2.783,18.564 2.16,17.054C1.537,15.543 2.033,13.791 3.367,12.792C4.011,12.306 4.796,12.044 5.602,12.047C6.408,12.049 7.191,12.316 7.832,12.806C9.128,13.813 9.556,15.569 8.876,17.075L14.429,18.242C14.517,18.26 14.608,18.259 14.695,18.239C14.782,18.218 14.864,18.179 14.935,18.124C15.005,18.069 15.063,18 15.104,17.92C15.146,17.841 15.169,17.753 15.173,17.664L15.484,8.135C13.717,8.3 12.107,7.191 11.661,5.506C11.215,3.82 12.065,2.043 13.677,1.292C15.287,0.541 17.197,1.031 18.201,2.456C19.206,3.881 19.019,5.828 17.757,7.073L25.346,12.997C25.416,13.05 25.497,13.087 25.582,13.107C25.667,13.126 25.756,13.127 25.842,13.11C25.928,13.093 26.009,13.058 26.08,13.007C26.152,12.956 26.211,12.89 26.256,12.814L29.137,7.827C28.392,7.685 27.713,7.309 27.197,6.754C26.682,6.198 26.358,5.492 26.273,4.739ZM31.655,21.939C31.915,21.75 32.091,21.466 32.144,21.149C32.17,20.993 32.164,20.833 32.127,20.68C32.09,20.526 32.023,20.381 31.929,20.254C31.835,20.126 31.716,20.02 31.579,19.94C31.443,19.859 31.292,19.807 31.135,19.787L26.803,19.167C26.565,19.133 26.322,19.169 26.104,19.271C25.886,19.372 25.702,19.535 25.574,19.739L23.692,22.77L20.161,22.264C19.923,22.23 19.68,22.266 19.462,22.368C19.244,22.47 19.06,22.632 18.932,22.837L16.624,26.556C16.512,26.734 16.449,26.94 16.442,27.15C16.435,27.361 16.485,27.57 16.586,27.756C16.688,27.941 16.838,28.095 17.02,28.204C17.201,28.312 17.408,28.37 17.62,28.373C17.834,28.376 18.045,28.324 18.233,28.222C18.421,28.119 18.58,27.97 18.693,27.788L20.574,24.756L24.107,25.263C24.591,25.333 25.076,25.107 25.335,24.691L27.216,21.66L30.749,22.165C31.069,22.211 31.394,22.129 31.655,21.939Z"
|
||||
android:fillColor="#AF9921"/>
|
||||
<path
|
||||
android:pathData="M26.489,0.349C25.795,0.668 25.219,1.197 24.84,1.86C24.462,2.524 24.301,3.29 24.38,4.049C24.465,4.802 24.789,5.508 25.304,6.064C25.819,6.619 26.499,6.996 27.243,7.137L24.362,12.125C24.318,12.201 24.258,12.266 24.187,12.317C24.115,12.368 24.034,12.403 23.948,12.42C23.862,12.438 23.774,12.436 23.688,12.417C23.603,12.398 23.522,12.36 23.453,12.307L15.863,6.385C17.126,5.138 17.312,3.192 16.308,1.767C15.302,0.342 13.395,-0.149 11.783,0.602C10.173,1.353 9.322,3.13 9.767,4.816C10.212,6.502 11.823,7.611 13.59,7.445L13.28,16.976C13.275,17.065 13.252,17.152 13.21,17.232C13.169,17.311 13.111,17.381 13.04,17.435C12.97,17.49 12.888,17.529 12.801,17.549C12.714,17.57 12.623,17.571 12.536,17.553L6.982,16.386C7.315,15.66 7.392,14.844 7.203,14.069C7.013,13.295 6.567,12.606 5.938,12.116C5.298,11.626 4.514,11.359 3.708,11.357C2.902,11.354 2.117,11.616 1.473,12.102C0.14,13.101 -0.356,14.852 0.266,16.363C0.889,17.875 2.475,18.765 4.122,18.529L10.658,28.478C12.293,30.968 15.552,31.863 18.307,30.579L30.684,24.807C33.368,23.559 34.787,20.604 34.049,17.796L30.897,5.759C31.394,5.125 31.662,4.34 31.656,3.534C31.65,2.727 31.371,1.946 30.864,1.319C29.819,0.038 28.014,-0.362 26.489,0.35V0.349Z"
|
||||
android:fillColor="#DBC175"/>
|
||||
<path
|
||||
android:pathData="M30.25,20.46C30.195,20.778 30.018,21.062 29.758,21.251C29.498,21.441 29.174,21.522 28.855,21.478L25.324,20.971L23.441,24.001C23.314,24.206 23.13,24.368 22.912,24.47C22.694,24.572 22.451,24.608 22.213,24.574L18.682,24.069L16.799,27.1C16.686,27.281 16.528,27.43 16.34,27.532C16.152,27.635 15.941,27.687 15.728,27.684C15.516,27.682 15.309,27.624 15.127,27.516C14.944,27.408 14.795,27.253 14.692,27.068C14.59,26.882 14.54,26.673 14.547,26.462C14.554,26.25 14.616,26.045 14.729,25.865L17.037,22.148C17.165,21.943 17.349,21.78 17.567,21.679C17.785,21.577 18.028,21.541 18.267,21.575L21.798,22.082L23.679,19.051C23.806,18.847 23.991,18.684 24.209,18.582C24.427,18.48 24.67,18.444 24.909,18.478L29.241,19.1C29.398,19.12 29.549,19.172 29.685,19.252C29.821,19.332 29.94,19.439 30.034,19.566C30.128,19.693 30.196,19.837 30.233,19.991C30.27,20.145 30.276,20.305 30.25,20.46Z"
|
||||
android:fillColor="#ffffff"/>
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="#BFD5D5D5" >
|
||||
<item>
|
||||
<shape>
|
||||
<gradient
|
||||
android:angle="360"
|
||||
android:endColor="#FFFFFFFF"
|
||||
android:startColor="#FFFFFFFF" />
|
||||
<corners android:radius="24dp"/>
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="38dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="38"
|
||||
android:viewportHeight="40">
|
||||
<path
|
||||
android:pathData="M37.175,37.758C37.175,36.803 29.366,36.02 19.747,36.02C10.114,36.02 2.319,36.803 2.319,37.758C2.319,38.727 10.114,39.511 19.747,39.511C29.366,39.511 37.175,38.727 37.175,37.758Z"
|
||||
android:fillColor="#E7E0BC"/>
|
||||
<path
|
||||
android:pathData="M23.76,26.757C23.76,28.458 24.435,30.089 25.638,31.292C26.84,32.494 28.472,33.17 30.172,33.17C31.873,33.17 33.504,32.494 34.707,31.292C35.909,30.089 36.585,28.458 36.585,26.757C36.585,25.056 35.909,23.426 34.707,22.223C33.504,21.02 31.873,20.345 30.172,20.345C28.472,20.345 26.84,21.02 25.638,22.223C24.435,23.426 23.76,25.056 23.76,26.757Z"
|
||||
android:fillColor="#FFE9AC"/>
|
||||
<path
|
||||
android:pathData="M26.757,10.869C29.578,12.606 31.911,15.315 33.225,18.741C36.246,26.611 31.372,31.715 24.028,34.535C16.682,37.355 9.645,36.822 6.624,28.951C5.358,25.7 5.196,22.123 6.164,18.772C3.57,18.327 1.689,15.908 1.85,13.217C2.01,10.528 4.155,8.475 6.774,8.506C6.563,5.304 8.375,2.384 11.263,1.276C14.147,0.169 17.447,1.126 19.434,3.646C20.003,2.916 20.769,2.366 21.643,2.061C22.516,1.755 23.459,1.708 24.358,1.924C26.209,2.362 27.693,3.825 28.2,5.715C28.706,7.603 28.147,9.595 26.757,10.869ZM12.014,18.457C11.972,18.64 11.967,18.829 11.999,19.013C12.031,19.197 12.099,19.374 12.198,19.532C12.298,19.69 12.428,19.827 12.581,19.935C12.734,20.043 12.907,20.12 13.089,20.161L16.015,20.821L14.422,21.434C14.241,21.497 14.076,21.595 13.934,21.723C13.793,21.851 13.678,22.007 13.598,22.18C13.518,22.353 13.473,22.541 13.467,22.731C13.46,22.922 13.492,23.112 13.561,23.291C13.629,23.469 13.733,23.631 13.865,23.769C13.998,23.906 14.157,24.016 14.332,24.09C14.508,24.165 14.697,24.204 14.888,24.205C15.078,24.205 15.267,24.167 15.443,24.093L18.103,23.073L18.614,24.402L15.954,25.424C15.604,25.561 15.322,25.832 15.17,26.176C15.019,26.52 15.009,26.91 15.144,27.261C15.279,27.612 15.547,27.896 15.89,28.05C16.233,28.204 16.623,28.217 16.975,28.084L19.634,27.063L20.146,28.394C20.208,28.575 20.306,28.742 20.434,28.884C20.562,29.027 20.717,29.142 20.891,29.223C21.064,29.304 21.252,29.35 21.444,29.356C21.635,29.363 21.826,29.331 22.005,29.263C22.184,29.194 22.347,29.09 22.485,28.957C22.622,28.824 22.732,28.664 22.806,28.488C22.881,28.312 22.92,28.122 22.919,27.931C22.919,27.739 22.88,27.549 22.805,27.373L22.295,26.042L24.955,25.021C25.306,24.883 25.587,24.613 25.739,24.269C25.89,23.924 25.9,23.534 25.765,23.183C25.63,22.832 25.362,22.549 25.019,22.394C24.676,22.24 24.286,22.228 23.934,22.36L21.273,23.382L20.763,22.051L23.424,21.031C23.6,20.965 23.761,20.864 23.898,20.736C24.035,20.607 24.145,20.452 24.222,20.281C24.299,20.109 24.342,19.924 24.347,19.736C24.352,19.548 24.32,19.361 24.253,19.186C24.185,19.01 24.084,18.85 23.954,18.714C23.824,18.577 23.669,18.468 23.497,18.392C23.325,18.317 23.14,18.276 22.952,18.272C22.764,18.268 22.577,18.301 22.402,18.37L20.81,18.981L22.546,16.53C22.753,16.222 22.831,15.844 22.764,15.479C22.696,15.113 22.489,14.788 22.185,14.574C21.882,14.359 21.507,14.271 21.139,14.329C20.772,14.387 20.442,14.587 20.22,14.885L17.799,18.302L13.716,17.381C13.348,17.298 12.962,17.365 12.642,17.567C12.323,17.768 12.097,18.089 12.014,18.457Z"
|
||||
android:fillColor="#AF9921"/>
|
||||
<path
|
||||
android:pathData="M31.384,17.919C30.07,14.496 27.736,11.786 24.914,10.049C26.306,8.775 26.865,6.781 26.359,4.893C25.852,3.005 24.368,1.54 22.517,1.104C21.618,0.888 20.676,0.936 19.803,1.241C18.93,1.546 18.163,2.096 17.594,2.826C15.608,0.305 12.307,-0.651 9.42,0.456C6.535,1.564 4.722,4.484 4.931,7.686C2.314,7.655 0.169,9.708 0.009,12.397C-0.15,15.086 1.729,17.507 4.323,17.952C3.355,21.303 3.517,24.88 4.783,28.131C7.804,36.002 14.841,36.535 22.187,33.715C29.533,30.895 34.405,25.792 31.384,17.919Z"
|
||||
android:fillColor="#DBC175"/>
|
||||
<path
|
||||
android:pathData="M11.103,18.912C10.739,18.821 10.424,18.592 10.225,18.273C10.026,17.955 9.959,17.571 10.037,17.204C10.073,17.024 10.144,16.854 10.248,16.703C10.351,16.552 10.483,16.423 10.637,16.325C10.792,16.226 10.964,16.16 11.144,16.129C11.325,16.099 11.509,16.105 11.687,16.148L15.677,17.103L18.006,13.723C18.143,13.521 18.332,13.361 18.553,13.259C18.774,13.156 19.019,13.116 19.261,13.141C19.757,13.193 20.192,13.51 20.404,13.973C20.508,14.199 20.553,14.447 20.533,14.694C20.513,14.942 20.429,15.18 20.29,15.385L18.62,17.808L20.166,17.215C20.395,17.129 20.643,17.105 20.885,17.147C21.126,17.188 21.353,17.294 21.54,17.452C21.929,17.774 22.124,18.281 22.051,18.781C22.018,19.024 21.92,19.253 21.768,19.446C21.616,19.638 21.416,19.787 21.188,19.876L18.603,20.868L19.114,22.198L21.698,21.207C22.41,20.933 23.218,21.306 23.5,22.04C23.783,22.776 23.432,23.594 22.72,23.867L20.135,24.859L20.646,26.19C20.829,26.664 20.75,27.199 20.442,27.589C20.292,27.781 20.092,27.928 19.865,28.015C19.637,28.103 19.39,28.127 19.15,28.085C18.906,28.042 18.677,27.935 18.486,27.777C18.296,27.619 18.149,27.414 18.061,27.182L17.551,25.851L14.968,26.843C14.254,27.116 13.447,26.743 13.165,26.009C12.883,25.274 13.232,24.456 13.946,24.182L16.529,23.19L16.019,21.861L13.436,22.853C13.206,22.939 12.958,22.963 12.716,22.921C12.474,22.88 12.248,22.774 12.061,22.616C11.869,22.456 11.722,22.25 11.633,22.017C11.543,21.785 11.515,21.533 11.55,21.287C11.584,21.044 11.682,20.814 11.833,20.622C11.985,20.43 12.186,20.281 12.414,20.192L13.962,19.598L11.101,18.912H11.103Z"
|
||||
android:fillColor="#ffffff"/>
|
||||
</vector>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@mipmap/oc_index_bg"
|
||||
android:background="@drawable/yjl_setting_bg"
|
||||
>
|
||||
|
||||
<TextView
|
||||
|
|
|
|||
|
|
@ -9,10 +9,11 @@
|
|||
android:id="@+id/ivActivityImg"
|
||||
android:layout_width="0dp"
|
||||
app:layout_constraintWidth_percent="0.95"
|
||||
app:layout_constraintHeight_percent="0.71"
|
||||
app:layout_constraintHeight_percent="0.78"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="10dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@mipmap/base_erro_activity"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
|
|
@ -29,6 +30,7 @@
|
|||
android:text="@string/recharge"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="18sp"
|
||||
android:visibility="gone"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginBottom="20dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/ivActivityImg"
|
||||
|
|
@ -47,6 +49,5 @@
|
|||
android:layout_marginBottom="20dp"
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
app:srcCompat="@drawable/ic_close_activity"
|
||||
android:tint="#B36C1B"
|
||||
/>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
android:layout_marginBottom="10dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/domain_warn"
|
||||
android:textColor="#B36C1B"
|
||||
android:textColor="#000"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
android:layout_height="wrap_content">
|
||||
<TextView
|
||||
android:id="@+id/but_cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/oc_login_bg"
|
||||
android:textColor="@color/white"
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
<TextView
|
||||
android:layout_alignParentRight="true"
|
||||
android:id="@+id/but_try"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/oc_login_bg"
|
||||
android:textColor="@color/white"
|
||||
|
|
|
|||
|
|
@ -9,30 +9,32 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/clContentView"
|
||||
android:layout_width="350dp"
|
||||
android:layout_height="400dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:background="@drawable/yjl_notice_bg_txt"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvNewTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="28dp"
|
||||
android:layout_marginTop="150dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:gravity="center"
|
||||
android:text="AAA"
|
||||
android:text="@string/NewNotice"
|
||||
android:textColor="#000000"
|
||||
android:textSize="16sp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/contentNet"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tvMySee"
|
||||
|
|
@ -64,12 +66,13 @@
|
|||
android:layout_marginStart="28dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center"
|
||||
android:text="AAA"
|
||||
android:text="@string/ReadAlready"
|
||||
android:textColor="#fff"
|
||||
android:textSize="14sp"
|
||||
android:background="@drawable/oc_login_bg"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
android:paddingStart="24dp"
|
||||
android:paddingEnd="24dp"
|
||||
android:paddingStart="86dp"
|
||||
android:paddingEnd="86dp"
|
||||
android:paddingTop="10dp"
|
||||
android:paddingBottom="10dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -92,6 +95,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
android:visibility="gone"
|
||||
app:srcCompat="@drawable/ic_close_activity"
|
||||
app:tint="#8FE2F5" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<ProgressBar
|
||||
android:layout_centerHorizontal="true"
|
||||
android:indeterminateTint="#B36C1B"
|
||||
android:indeterminateTint="#FF6FA2FA"
|
||||
android:id="@+id/pg"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"/>
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
<!-- android:layout_height="wrap_content"/>-->
|
||||
<TextView
|
||||
android:id="@+id/tv_dialog_msg"
|
||||
android:textColor="#B36C1B"
|
||||
android:textColor="#000"
|
||||
android:textSize="16sp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,12 @@
|
|||
android:background="@mipmap/yjl_home_bkg"
|
||||
>
|
||||
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/clUserCard"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -172,8 +177,7 @@
|
|||
android:layout_width="250dp"
|
||||
android:layout_height="250dp"
|
||||
android:src="@mipmap/yjl_home_clink_bg"
|
||||
tools:layout_editor_absoluteX="0dp"
|
||||
tools:layout_editor_absoluteY="-2dp" />
|
||||
/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
|
@ -290,4 +294,8 @@
|
|||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -8,17 +8,17 @@
|
|||
android:layout_margin="8dp"
|
||||
>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/aivActivity"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tvReceive"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginTop="21dp"
|
||||
android:layout_marginBottom="21dp"
|
||||
android:layout_marginStart="21dp"
|
||||
android:layout_marginEnd="21dp"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
|
||||
>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
@ -30,32 +30,13 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#B36C1B"
|
||||
android:textColor="#FF000000"
|
||||
android:text="活动标题"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvReceive"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:textSize="12sp"
|
||||
android:paddingTop="6dp"
|
||||
android:paddingBottom="6dp"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp"
|
||||
android:textColor="#B36C1B"
|
||||
android:text="@string/GetRewards"
|
||||
android:background="@drawable/oc_version_up_bg"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginEnd="10dp"
|
||||
/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -68,7 +49,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/ActivityContent"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#B36C1B"
|
||||
android:textColor="#FF000000"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
|
@ -101,7 +82,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/RewardTime"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#B36C1B"
|
||||
android:textColor="#FF000000"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
|
@ -124,4 +105,33 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvReceive"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:textSize="12sp"
|
||||
android:paddingTop="6dp"
|
||||
android:paddingBottom="6dp"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:textColor="#fff"
|
||||
android:text="@string/goEnd"
|
||||
android:background="@drawable/oc_login_bg"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginEnd="10dp"
|
||||
/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/aivActivity"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginStart="18dp"
|
||||
android:src="@drawable/yjl_pay_item_icon"
|
||||
/>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@mipmap/oc_index_bg"
|
||||
android:background="#FF6FA2FA"
|
||||
>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/clTitle"
|
||||
|
|
@ -24,17 +24,19 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:tint="#FFFFFFFF"
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#B36C1B"
|
||||
android:textColor="#FFFFFFFF"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:text="@string/activity"
|
||||
android:textSize="18sp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
android:layout_marginTop="10dp"
|
||||
android:text=""
|
||||
android:textColor="#000000"
|
||||
android:textSize="16sp" />
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
android:layout_height="60dp"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:src="@mipmap/yjl_usericon"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:background="@drawable/user_center_vip_bg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:text="AAA"
|
||||
android:text=""
|
||||
android:textColor="#FFB3B3B3"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
|
@ -219,8 +219,8 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
|
|
@ -285,7 +285,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/mySerVice"
|
||||
android:textColor="#FF000000"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:textSize="13sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="@+id/shareCard"
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 178 KiB |
|
|
@ -465,4 +465,7 @@
|
|||
<string name="jstimeStr">不限时间</string>
|
||||
<string name="VipSerTxt">你的专属客服当前在线， </string>
|
||||
<string name="LinekCustom">点击为你解答</string>
|
||||
<string name="NewNotice">最新通知</string>
|
||||
<string name="vipTimeStrEd">你的会员还有$天到期</string>
|
||||
<string name="goEnd">去完成</string>
|
||||
</resources>
|
||||
Loading…
Reference in New Issue