Commit a05db8c9 authored by sheteng's avatar sheteng

2.0 开发 3

parent d97bb8d1
...@@ -9,7 +9,7 @@ data class Game( ...@@ -9,7 +9,7 @@ data class Game(
data class GameInfo( data class GameInfo(
val announcementList: List<Announcement>, val announcementList: List<Announcement>,
val anotherName: String, val anotherName: String,
val boosterPackageName: String, val boosterPackageName: String?,
val boosterServer: String, val boosterServer: String,
val createdDate: String, val createdDate: String,
val dnsServer: String, val dnsServer: String,
......
package com.ccwangluo.accelerator.ui.gameList package com.ccwangluo.accelerator.ui.gameList
import android.content.Intent
import android.net.Uri
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
...@@ -15,15 +17,15 @@ import com.ccwangluo.accelerator.R ...@@ -15,15 +17,15 @@ import com.ccwangluo.accelerator.R
import com.ccwangluo.accelerator.adapter.KotlinDataAdapter import com.ccwangluo.accelerator.adapter.KotlinDataAdapter
import com.ccwangluo.accelerator.databinding.FragmentGameListBinding import com.ccwangluo.accelerator.databinding.FragmentGameListBinding
import com.ccwangluo.accelerator.manager.GameDownLoadManger import com.ccwangluo.accelerator.manager.GameDownLoadManger
import com.ccwangluo.accelerator.manager.GameDownLoadManger.download
import com.ccwangluo.accelerator.model.GameInfo import com.ccwangluo.accelerator.model.GameInfo
import com.ccwangluo.accelerator.ui.dialog.CommonDialog import com.ccwangluo.accelerator.ui.dialog.CommonDialog
import com.ccwangluo.accelerator.ui.dialog.GameDownloadDialog import com.ccwangluo.accelerator.ui.dialog.GameDownloadDialog
import com.ccwangluo.accelerator.ui.home.AcceleratorFragment import com.ccwangluo.accelerator.ui.home.AcceleratorFragment
import com.ccwangluo.accelerator.utils.* import com.ccwangluo.accelerator.utils.AcceleratorUtils
import com.ccwangluo.accelerator.utils.ByteUtils
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.Core.activity
import com.github.shadowsocks.bg.AuthManager.gameId
import com.github.shadowsocks.bg.BaseService import com.github.shadowsocks.bg.BaseService
import com.xuexiang.xpage.base.XPageFragment import com.xuexiang.xpage.base.XPageFragment
import com.xuexiang.xpage.utils.TitleBar import com.xuexiang.xpage.utils.TitleBar
......
...@@ -158,6 +158,7 @@ class AcceleratorFragment : XPageFragment() { ...@@ -158,6 +158,7 @@ class AcceleratorFragment : XPageFragment() {
binding.gamePicOut.startAnimation(getDefaultAnim()) binding.gamePicOut.startAnimation(getDefaultAnim())
} }
binding.radiusTv.visibility = if (SysUtils.getChannel() == 3) View.GONE else View.VISIBLE binding.radiusTv.visibility = if (SysUtils.getChannel() == 3) View.GONE else View.VISIBLE
binding.accGameName.setText(AcceleratorUtils.game!!.gameName)
} }
override fun initListeners() { override fun initListeners() {
...@@ -296,6 +297,10 @@ class AcceleratorFragment : XPageFragment() { ...@@ -296,6 +297,10 @@ class AcceleratorFragment : XPageFragment() {
} }
} }
} }
binding.btnClose.setOnClickListener {
popToBack()
}
AcceleratorUtils.registerStateListener { state, l, net -> AcceleratorUtils.registerStateListener { state, l, net ->
net?.let { net?.let {
acceleratorViewModel.netState.postValue(net) acceleratorViewModel.netState.postValue(net)
......
...@@ -191,7 +191,7 @@ object AcceleratorUtils : TencentLocationListener { ...@@ -191,7 +191,7 @@ object AcceleratorUtils : TencentLocationListener {
) )
if (game != null) { if (game != null) {
proxyGames.add(game.packageName) proxyGames.add(game.packageName)
game.boosterPackageName.split(",").forEach { game.boosterPackageName?.split(",")?.forEach {
if (!StringUtils.isEmpty(it)) { if (!StringUtils.isEmpty(it)) {
proxyGames.add(it) proxyGames.add(it)
} }
......
...@@ -23,53 +23,72 @@ ...@@ -23,53 +23,72 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="47.5dp"> android:layout_marginTop="47.5dp">
<ImageView
android:id="@+id/btn_close"
android:padding="2.5dp"
android:layout_width="15dp"
android:layout_height="20dp"
android:layout_marginStart="17.5dp"
android:layout_centerVertical="true"
android:layout_marginEnd="22.15dp"
android:src="@mipmap/back_icon_white" />
<TextView <TextView
android:id="@+id/acc_state_tx" android:id="@+id/acc_game_name"
android:layout_gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="20dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
android:textSize="16sp" /> android:textSize="16sp" />
<!-- <ImageView--> <!-- <ImageView-->
<!-- android:id="@+id/acc_share"--> <!-- android:id="@+id/acc_share"-->
<!-- android:layout_width="20dp"--> <!-- android:layout_width="20dp"-->
<!-- android:layout_height="20dp"--> <!-- android:layout_height="20dp"-->
<!-- android:layout_alignParentEnd="true"--> <!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_centerVertical="true"--> <!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginEnd="22.15dp"--> <!-- android:layout_marginEnd="22.15dp"-->
<!-- android:background="@mipmap/share" />--> <!-- android:background="@mipmap/share" />-->
<!-- <RelativeLayout--> <!-- <RelativeLayout-->
<!-- android:id="@+id/icon_notice"--> <!-- android:id="@+id/icon_notice"-->
<!-- android:layout_width="19dp"--> <!-- android:layout_width="19dp"-->
<!-- android:layout_height="21dp"--> <!-- android:layout_height="21dp"-->
<!-- android:layout_alignParentEnd="true"--> <!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_centerVertical="true"--> <!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginEnd="22.15dp">--> <!-- android:layout_marginEnd="22.15dp">-->
<!-- <ImageView--> <!-- <ImageView-->
<!-- android:layout_width="19dp"--> <!-- android:layout_width="19dp"-->
<!-- android:layout_height="20dp"--> <!-- android:layout_height="20dp"-->
<!-- android:layout_alignParentEnd="true"--> <!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_centerVertical="true"--> <!-- android:layout_centerVertical="true"-->
<!-- android:background="@mipmap/message" />--> <!-- android:background="@mipmap/message" />-->
<!-- <com.xuexiang.xui.widget.button.roundbutton.RoundButton--> <!-- <com.xuexiang.xui.widget.button.roundbutton.RoundButton-->
<!-- android:id="@+id/icon_notice_badge"--> <!-- android:id="@+id/icon_notice_badge"-->
<!-- android:layout_width="8dp"--> <!-- android:layout_width="8dp"-->
<!-- android:layout_height="8dp"--> <!-- android:layout_height="8dp"-->
<!-- android:layout_alignParentEnd="true"--> <!-- android:layout_alignParentEnd="true"-->
<!-- android:visibility="gone"--> <!-- android:visibility="gone"-->
<!-- app:rb_backgroundColor="@color/red"--> <!-- app:rb_backgroundColor="@color/red"-->
<!-- app:rb_radius="4dp" />--> <!-- app:rb_radius="4dp" />-->
<!-- </RelativeLayout>--> <!-- </RelativeLayout>-->
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/acc_state_tx"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_centerInParent="true"
android:textColor="#FFFFFFFF"
android:textSize="12.5sp" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="40dp" android:layout_height="wrap_content"
android:layout_height="wrap_content"> android:layout_marginTop="20dp">
<ImageView <ImageView
...@@ -158,11 +177,11 @@ ...@@ -158,11 +177,11 @@
<ImageView <ImageView
android:id="@+id/game_start" android:id="@+id/game_start"
android:visibility="gone"
android:layout_width="190dp" android:layout_width="190dp"
android:layout_height="190dp" android:layout_height="190dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:background="@mipmap/game_start_btn" /> android:background="@mipmap/game_start_btn"
android:visibility="gone" />
<com.xuexiang.xui.widget.layout.XUILinearLayout <com.xuexiang.xui.widget.layout.XUILinearLayout
......
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