Commit 1bdd68a7 authored by sheteng's avatar sheteng

一键登录版本升级

parent b5a2cffc
......@@ -69,12 +69,11 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.github.bumptech.glide:glide:4.12.0")
implementation("com.squareup.okhttp3:okhttp:4.9.0")
implementation("com.google.code.gson:gson:2.8.7")
implementation("com.github.xuexiangjys:XUI:1.1.8")
implementation("com.karumi:dexter:6.2.3")
//工具类
implementation("com.github.xuexiangjys.XUtil:xutil-core:2.0.0")
implementation("com.github.xuexiangjys.XUtil:xutil-sub:2.0.0")
......@@ -86,6 +85,8 @@ dependencies {
implementation("com.github.getActivity:ToastUtils:10.3")
implementation("com.chuanglan.android.sdk:shanyan:2.3.4.3")
implementation("com.github.xuexiangjys.AgentWeb:agentweb-core:1.0.0")
implementation("com.github.xuexiangjys.AgentWeb:agentweb-download:1.0.0")
implementation("com.github.xuexiangjys.AgentWeb:agentweb-filechooser:1.0.0")
......
......@@ -10,7 +10,7 @@ import com.ccwangluo.accelerator.ui.home.AccelertorViewModel
import com.ccwangluo.accelerator.ui.home.MineFragment
import com.ccwangluo.accelerator.ui.home.NewsFragment
import com.ccwangluo.accelerator.utils.LoginUtils
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.xuexiang.xpage.annotation.Page
import com.xuexiang.xpage.base.XPageFragment
......
......@@ -17,11 +17,6 @@ import com.ccwangluo.cc_quickly.utils.SettingSPUtils
import com.github.shadowsocks.bg.AuthManager
import com.github.shadowsocks.utils.StartService
import com.hjq.toast.ToastUtils
import com.karumi.dexter.Dexter
import com.karumi.dexter.MultiplePermissionsReport
import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.tencent.map.geolocation.TencentLocation
import com.tencent.map.geolocation.TencentLocationListener
import com.tencent.map.geolocation.TencentLocationManager
......@@ -34,10 +29,11 @@ import android.hardware.SensorEventListener
import android.os.Handler
import android.util.Log
import com.ccwangluo.accelerator.ui.dialog.PermissionDialog
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer
import com.tencent.android.tpush.XGIOperateCallback
import com.tencent.android.tpush.XGPushManager
import com.xuexiang.xutil.system.PermissionUtils
class MainActivity() : XPageActivity(), TencentLocationListener {
......@@ -95,38 +91,33 @@ class MainActivity() : XPageActivity(), TencentLocationListener {
}
fun getPermission() {
//获取权限
Dexter.withContext(this)
.withPermissions(
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.ACCESS_FINE_LOCATION
)
.withListener(object : MultiplePermissionsListener {
override fun onPermissionsChecked(p0: MultiplePermissionsReport?) {
p0?.let {
it.grantedPermissionResponses.forEach {
if (it.permissionName.equals(Manifest.permission.ACCESS_FINE_LOCATION)) {
TencentLocationManager.getInstance(this@MainActivity)
.requestSingleFreshLocation(
null,
this@MainActivity,
Looper.getMainLooper()
)
}
}
}
PermissionUtils.permission(Manifest.permission.READ_PHONE_STATE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.ACCESS_FINE_LOCATION).rationale({
}).callback(object : PermissionUtils.FullCallback {
override fun onGranted(permissionsGranted: MutableList<String>?) {
permissionsGranted?.forEach {
if (it.equals(Manifest.permission.ACCESS_FINE_LOCATION)) {
TencentLocationManager.getInstance(this@MainActivity)
.requestSingleFreshLocation(
null,
this@MainActivity,
Looper.getMainLooper()
)
}
}
override fun onPermissionRationaleShouldBeShown(
p0: MutableList<PermissionRequest>?,
p1: PermissionToken?
) {
// PermissionUtils.openAppSettings()
}
}
override fun onDenied(
permissionsDeniedForever: MutableList<String>?,
permissionsDenied: MutableList<String>?
) {
}).check()
}
}).request()
}
private fun initPhoneUtils() {
......@@ -164,7 +155,7 @@ class MainActivity() : XPageActivity(), TencentLocationListener {
AcceleratorUtils.checkVpn()
}, 1000)
//QQ官方sdk授权
Tencent.setIsPermissionGranted(true);
Tencent.setIsPermissionGranted(true)
}
override fun onPause() {
......
......@@ -19,7 +19,7 @@ import com.ccwangluo.accelerator.utils.AcceleratorUtils
import com.ccwangluo.accelerator.utils.LoginUtils
import com.ccwangluo.accelerator.utils.ShareUtils
import com.ccwangluo.accelerator.utils.SysUtils
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.ccwangluo.cc_quickly.utils.SettingSPUtils
import com.github.shadowsocks.bg.BaseService
import com.github.shadowsocks.http.HttpConfig
......@@ -237,20 +237,20 @@ class AccelertorFragment : XPageFragment() {
AcceleratorUtils.getGameList(this) {
if (it) {
//
AcceleratorUtils.game?.let {
if (!SysUtils.isPackageInstall(requireContext(), it.packageName)) {
binding.quickTopToast.visibility = View.VISIBLE
binding.quickTopToastTx.setText("请先安装游戏后加速")
binding.quickTopToastTx.postDelayed({
binding.quickTopToast.visibility = View.GONE
}, 2000)
DataRePortUtils.report(
"st_speed_result",
mapOf("result" to 0, "cause" to "1")
)
return@getGameList
}
}
// AcceleratorUtils.game?.let {
// if (!SysUtils.isPackageInstall(requireContext(), it.packageName)) {
// binding.quickTopToast.visibility = View.VISIBLE
// binding.quickTopToastTx.setText("请先安装游戏后加速")
// binding.quickTopToastTx.postDelayed({
// binding.quickTopToast.visibility = View.GONE
// }, 2000)
// DataRePortUtils.report(
// "st_speed_result",
// mapOf("result" to 0, "cause" to "1")
// )
// return@getGameList
// }
// }
//用户是否有使用时长
LoginUtils.getUserHasTimer(this@AccelertorFragment) {
if (it) {
......@@ -425,7 +425,6 @@ class AccelertorFragment : XPageFragment() {
fun startAccSuccess() {
if (binding.gameStart.visibility == View.GONE) {
DataRePortUtils.report("st_speed_result", mapOf("result" to 1))
binding.gamePicIn1.startAnimation(getDefaultAnim())
binding.accStateTx.visibility = View.VISIBLE
binding.btnQuick.setBackgroundResource(R.mipmap.quick_stop)
......
......@@ -20,7 +20,7 @@ import com.ccwangluo.accelerator.ui.news.NewsCollectionAdapter
import com.ccwangluo.accelerator.ui.web.CommonWebViewFragment
import com.ccwangluo.accelerator.utils.AcceleratorUtils
import com.ccwangluo.accelerator.utils.SysUtils
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
......@@ -49,6 +49,7 @@ class NewsFragment : XPageFragment() {
var adapter: NewsCollectionAdapter? = null
override fun initViews() {
newsViewModel.notice.observe(this, {
binding.newsNotice.visibility = View.VISIBLE
it.forEach {
binding.tvMarquee.addDisplayString(it.title)
}
......
......@@ -22,7 +22,7 @@ class NewsViewModel : ViewModel() {
fun getNotice(gameId: Int) {
viewModelScope.launch(Dispatchers.IO) {
val res =
HttpGo.getSync<NoticeList>("/api/announcement/list?gameId=$gameId&page=1&size=10")
HttpGo.getSync<NoticeList>("/api/announcement/list?gameId=$gameId&page=1&size=1")
res?.let {
if (it.code == 200) {
it.data?.list?.let {
......
......@@ -6,7 +6,7 @@ import androidx.lifecycle.viewModelScope
import com.ccwangluo.accelerator.model.LoginRes
import com.ccwangluo.accelerator.utils.LoginUtils
import com.ccwangluo.accelerator.utils.SysUtils
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.ccwangluo.accelerator.utils.http.HttpGo
import com.hjq.toast.ToastUtils
import kotlinx.coroutines.Dispatchers
......
......@@ -9,7 +9,7 @@ import com.ccwangluo.accelerator.databinding.FragmentLoginPhoneBinding
import com.ccwangluo.accelerator.ui.web.BlankActivity
import com.ccwangluo.accelerator.ui.web.CommonWebViewFragment
import com.ccwangluo.accelerator.utils.LoginUtils
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.github.shadowsocks.http.HttpConfig
import com.hjq.toast.ToastUtils
import com.xuexiang.xpage.annotation.Page
......
......@@ -7,8 +7,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast
import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
......@@ -26,7 +24,7 @@ import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard
import com.ccwangluo.accelerator.model.NewsModel
import com.ccwangluo.accelerator.ui.view.RatingBar
import com.ccwangluo.accelerator.ui.web.CommonWebViewFragment
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.github.shadowsocks.http.HttpConfig
import com.hjq.toast.ToastUtils
......
......@@ -17,7 +17,7 @@ import android.provider.Settings
import com.ccwangluo.accelerator.utils.AcceleratorUtils
import com.ccwangluo.accelerator.utils.ShareUtils
import com.ccwangluo.accelerator.utils.SysUtils
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.github.shadowsocks.bg.BaseService
import com.tencent.bugly.beta.Beta
......
......@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import com.ccwangluo.accelerator.model.*
import com.ccwangluo.accelerator.ui.dialog.CommonDialog
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.ccwangluo.accelerator.utils.http.HttpGo
import com.github.shadowsocks.Core
import com.github.shadowsocks.acl.Acl
......@@ -214,6 +214,10 @@ object AcceleratorUtils {
ToastUtils.show(msg)
}
}
if (state == BaseService.State.Connected && getAccTime() < 100){
DataRePortUtils.report("st_speed_result", mapOf("result" to 1))
}
}
override fun onServiceConnected(service: IShadowsocksService) {
......
......@@ -7,7 +7,7 @@ import androidx.lifecycle.lifecycleScope
import com.ccwangluo.accelerator.model.LoginRes
import com.ccwangluo.accelerator.model.UserProfile
import com.ccwangluo.accelerator.ui.login.PhoneLoginActivity
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.ccwangluo.accelerator.utils.http.HttpGo
import com.chuanglan.shanyan_sdk.OneKeyLoginManager
import com.github.shadowsocks.Core
......
......@@ -11,7 +11,7 @@ import android.widget.RelativeLayout
import android.widget.TextView
import com.ccwangluo.accelerator.R
import com.ccwangluo.accelerator.ui.login.PhoneLoginActivity
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.chuanglan.shanyan_sdk.OneKeyLoginManager
import com.chuanglan.shanyan_sdk.tool.ShanYanUIConfig
......
......@@ -4,7 +4,7 @@ import android.app.Activity
import android.view.View
import android.view.ViewGroup
import com.ccwangluo.accelerator.R
import com.ccwangluo.accelerator.utils.dataReport.DataRePortUtils
import com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import com.github.shadowsocks.http.HttpConfig
import com.umeng.socialize.ShareAction
import com.umeng.socialize.bean.SHARE_MEDIA
......
package com.ccwangluo.accelerator.utils.dataReport
package com.ccwangluo.accelerator.utils.datareport
import com.ccwangluo.accelerator.utils.LoginUtils
import com.ccwangluo.accelerator.utils.SysUtils
import com.google.gson.JsonObject
import com.xuexiang.xutil.net.NetworkUtils
import org.json.JSONObject
import java.time.LocalDateTime
data class BaseData(
......
package com.ccwangluo.accelerator.utils.dataReport
package com.ccwangluo.accelerator.utils.datareport
import com.ccwangluo.accelerator.utils.SysUtils
import com.ccwangluo.accelerator.utils.http.HttpGo
......
......@@ -2,19 +2,15 @@ package com.ccwangluo.accelerator.utils.http
import com.ccwangluo.accelerator.model.BaseModel
import com.ccwangluo.accelerator.utils.LoginUtils
import com.ccwangluo.accelerator.utils.dataReport.BaseData
import com.ccwangluo.accelerator.utils.datareport.BaseData
import com.github.shadowsocks.http.HttpConfig
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.hjq.toast.ToastUtils
import com.tencent.bugly.proguard.T
import com.xuexiang.xutil.XUtil
import com.umeng.vt.diff.V
import okhttp3.*
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody.Companion.toRequestBody
import org.json.JSONObject
import timber.log.Timber
import java.io.IOException
import java.security.SecureRandom
......
......@@ -58,6 +58,8 @@
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/news_notice"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginLeft="20dp"
......
......@@ -16,7 +16,6 @@ object HttpConfig {
val UI_MAIN_URL = "https://cc-tt-front.srccwl.com/#" //生产
//隐私协议地址
val HTML_HOST_PRIVACY="https://sdk-static.srccwl.com/tt_html/"
//用户协议
......
......@@ -9,7 +9,8 @@ repositories {
}
maven { url = uri("https://jitpack.io") }
maven { url = uri("https://repo1.maven.org/maven2/") }
maven { url = uri("https://dl.bintray.com/thelasterstar/maven/") }
// maven { url = uri("https://dl.bintray.com/thelasterstar/maven/") }
maven { url = uri("https://nexus-sdk.cm253.com/repository/maven-public/") }
google()
jcenter()
mavenCentral()
......
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