Commit f7f175ee authored by liusheng's avatar liusheng

修复点击游戏冲突

parent 8e6f0a36
......@@ -253,6 +253,7 @@ class AccelertorFragment : XPageFragment() {
}
binding.gameStart.setOnClickListener {
if (!binding.expandableLayout1.isExpanded) {
AcceleratorUtils.game?.let {
AppUtils.launchApp(it.packageName)
if (state == BaseService.State.Connected) {
......@@ -263,6 +264,7 @@ class AccelertorFragment : XPageFragment() {
}
}
}
}
fun openToWebview(url: String) {
val params = Bundle()
......
......@@ -123,12 +123,11 @@ class AndroidInterface(val xPageFragment: XPageFragment, val agentWeb: AgentWeb)
*/
@JavascriptInterface
fun getUpdateInfo(callback: String) {
val updateInfo: UpgradeInfo =Beta.getUpgradeInfo()
updateInfo?.let {
Beta.getUpgradeInfo()?.let {
//是否有更新:1有 0没有
//最新安装包的版本名称
agentWeb.jsAccessEntrace
.quickCallJs(callback, "1", AppUtils.getAppVersionName(),updateInfo.versionName)
.quickCallJs(callback, "1", AppUtils.getAppVersionName(),it.versionName)
} ?: let{
agentWeb.jsAccessEntrace
......
......@@ -376,7 +376,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center_vertical"
android:text="开启"
android:text="开启"
android:textColor="#FFFFFFFF"
android:textSize="16sp" />
</LinearLayout>
......
......@@ -2,11 +2,11 @@
"formatVersion": 1,
"database": {
"version": 29,
"identityHash": "ec1c94566e8753e5bd68c6a4274aafc4",
"identityHash": "c6293b758903bd4b8084f9d2f0ce9763",
"entities": [
{
"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": [
{
"fieldPath": "id",
......@@ -128,12 +128,6 @@
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "outboundBindInterface",
"columnName": "outboundBindInterface",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "subscription",
"columnName": "subscription",
......@@ -204,7 +198,7 @@
"views": [],
"setupQueries": [
"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 {
/**
* 主页h5
*/
//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 = "https://test-cc-tt-front.orangenet.org.cn/#" //测试
//val UI_MAIN_URL = "http://10.3.0.217:8080/#"
// 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