Commit 4f0e95f7 authored by Max Lv's avatar Max Lv

fix an UI issue

parent 02fc0b88
...@@ -5,8 +5,8 @@ import sbtandroid._ ...@@ -5,8 +5,8 @@ import sbtandroid._
import sbtandroid.AndroidKeys._ import sbtandroid.AndroidKeys._
object App { object App {
val version = "1.8.1" val version = "1.8.2"
val versionCode = 46 val versionCode = 47
} }
object General { object General {
......
...@@ -359,6 +359,24 @@ class Shadowsocks ...@@ -359,6 +359,24 @@ class Shadowsocks
} }
} }
def getLayoutView(view: ViewParent): LinearLayout = {
view match {
case layout: LinearLayout => layout
case _ => if (view != null) getLayoutView(view.getParent) else null
}
}
def initAdView() {
if (settings.getString(Key.proxy, "") == "198.199.101.152") {
val adView = new AdView(this, AdSize.BANNER, "a151becb8068b09")
val layoutView = getLayoutView(getListview.asInstanceOf[ViewParent])
if (layoutView != null) {
layoutView.addView(adView, 0)
adView.loadAd(new AdRequest)
}
}
}
/** Called when the activity is first created. */ /** Called when the activity is first created. */
override def onCreate(savedInstanceState: Bundle) { override def onCreate(savedInstanceState: Bundle) {
setHeaderRes(R.xml.shadowsocks_headers) setHeaderRes(R.xml.shadowsocks_headers)
...@@ -383,23 +401,7 @@ class Shadowsocks ...@@ -383,23 +401,7 @@ class Shadowsocks
receiver = new StateBroadcastReceiver() receiver = new StateBroadcastReceiver()
registerReceiver(receiver, new IntentFilter(Action.UPDATE_STATE)) registerReceiver(receiver, new IntentFilter(Action.UPDATE_STATE))
if (settings.getString(Key.proxy, "") == "198.199.101.152") { initAdView()
val adView = new AdView(this, AdSize.SMART_BANNER, "a151becb8068b09")
val rootView = findViewById(android.R.id.content).asInstanceOf[ViewParent]
val layoutView = {
def getLayoutView(view: ViewParent): LinearLayout = {
view match {
case layout: LinearLayout => layout
case _ => if (view != null) getLayoutView(view.getParent) else null
}
}
getLayoutView(rootView)
}
if (layoutView != null) {
layoutView.addView(adView, 0)
adView.loadAd(new AdRequest)
}
}
val init: Boolean = !Shadowsocks.isServiceStarted(this) val init: Boolean = !Shadowsocks.isServiceStarted(this)
if (init) { if (init) {
......
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