Commit f7f175ee authored by liusheng's avatar liusheng

修复点击游戏冲突

parent 8e6f0a36
...@@ -253,12 +253,14 @@ class AccelertorFragment : XPageFragment() { ...@@ -253,12 +253,14 @@ class AccelertorFragment : XPageFragment() {
} }
binding.gameStart.setOnClickListener { binding.gameStart.setOnClickListener {
AcceleratorUtils.game?.let { if (!binding.expandableLayout1.isExpanded) {
AppUtils.launchApp(it.packageName) AcceleratorUtils.game?.let {
if (state == BaseService.State.Connected) { AppUtils.launchApp(it.packageName)
binding.gameStart.postDelayed({ if (state == BaseService.State.Connected) {
ToastUtils.show("TT正在为游戏加速") binding.gameStart.postDelayed({
}, 1000) ToastUtils.show("TT正在为游戏加速")
}, 1000)
}
} }
} }
} }
......
...@@ -123,12 +123,11 @@ class AndroidInterface(val xPageFragment: XPageFragment, val agentWeb: AgentWeb) ...@@ -123,12 +123,11 @@ class AndroidInterface(val xPageFragment: XPageFragment, val agentWeb: AgentWeb)
*/ */
@JavascriptInterface @JavascriptInterface
fun getUpdateInfo(callback: String) { fun getUpdateInfo(callback: String) {
val updateInfo: UpgradeInfo =Beta.getUpgradeInfo() Beta.getUpgradeInfo()?.let {
updateInfo?.let {
//是否有更新:1有 0没有 //是否有更新:1有 0没有
//最新安装包的版本名称 //最新安装包的版本名称
agentWeb.jsAccessEntrace agentWeb.jsAccessEntrace
.quickCallJs(callback, "1", AppUtils.getAppVersionName(),updateInfo.versionName) .quickCallJs(callback, "1", AppUtils.getAppVersionName(),it.versionName)
} ?: let{ } ?: let{
agentWeb.jsAccessEntrace agentWeb.jsAccessEntrace
......
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="开启" android:text="开启"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"formatVersion": 1, "formatVersion": 1,
"database": { "database": {
"version": 29, "version": 29,
"identityHash": "ec1c94566e8753e5bd68c6a4274aafc4", "identityHash": "c6293b758903bd4b8084f9d2f0ce9763",
"entities": [ "entities": [
{ {
"tableName": "Profile", "tableName": "Profile",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `host` TEXT NOT NULL, `remotePort` INTEGER NOT NULL, `password` TEXT NOT NULL, `token` TEXT, `method` TEXT NOT NULL, `authTimeout` INTEGER NOT NULL, `beatsInterval` INTEGER NOT NULL, `retryLimit` INTEGER NOT NULL, `route` TEXT NOT NULL, `remoteDns` TEXT NOT NULL, `proxyApps` INTEGER NOT NULL, `bypass` INTEGER NOT NULL, `udpdns` INTEGER NOT NULL, `ipv6` INTEGER NOT NULL, `metered` INTEGER NOT NULL, `individual` TEXT NOT NULL, `plugin` TEXT, `udpFallback` INTEGER, `outboundBindInterface` TEXT, `subscription` INTEGER NOT NULL, `tx` INTEGER NOT NULL, `rx` INTEGER NOT NULL, `userOrder` INTEGER NOT NULL)", "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `host` TEXT NOT NULL, `remotePort` INTEGER NOT NULL, `password` TEXT NOT NULL, `token` TEXT, `method` TEXT NOT NULL, `authTimeout` INTEGER NOT NULL, `beatsInterval` INTEGER NOT NULL, `retryLimit` INTEGER NOT NULL, `route` TEXT NOT NULL, `remoteDns` TEXT NOT NULL, `proxyApps` INTEGER NOT NULL, `bypass` INTEGER NOT NULL, `udpdns` INTEGER NOT NULL, `ipv6` INTEGER NOT NULL, `metered` INTEGER NOT NULL, `individual` TEXT NOT NULL, `plugin` TEXT, `udpFallback` INTEGER, `subscription` INTEGER NOT NULL, `tx` INTEGER NOT NULL, `rx` INTEGER NOT NULL, `userOrder` INTEGER NOT NULL)",
"fields": [ "fields": [
{ {
"fieldPath": "id", "fieldPath": "id",
...@@ -128,12 +128,6 @@ ...@@ -128,12 +128,6 @@
"affinity": "INTEGER", "affinity": "INTEGER",
"notNull": false "notNull": false
}, },
{
"fieldPath": "outboundBindInterface",
"columnName": "outboundBindInterface",
"affinity": "TEXT",
"notNull": false
},
{ {
"fieldPath": "subscription", "fieldPath": "subscription",
"columnName": "subscription", "columnName": "subscription",
...@@ -204,7 +198,7 @@ ...@@ -204,7 +198,7 @@
"views": [], "views": [],
"setupQueries": [ "setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ec1c94566e8753e5bd68c6a4274aafc4')" "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c6293b758903bd4b8084f9d2f0ce9763')"
] ]
} }
} }
\ No newline at end of file
...@@ -11,8 +11,8 @@ object HttpConfig { ...@@ -11,8 +11,8 @@ object HttpConfig {
/** /**
* 主页h5 * 主页h5
*/ */
//val UI_MAIN_URL = "https://test-cc-tt-front.orangenet.org.cn/#" //测试 val UI_MAIN_URL = "https://test-cc-tt-front.orangenet.org.cn/#" //测试
val UI_MAIN_URL = "http://10.3.0.217:8080/#" //val UI_MAIN_URL = "http://10.3.0.217:8080/#"
// val UI_MAIN_URL = "https://cc-tt-front.srccwl.com/#" //生产 // val UI_MAIN_URL = "https://cc-tt-front.srccwl.com/#" //生产
//隐私协议地址 //隐私协议地址
......
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