Commit 3b8c928b authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 42806dbc
......@@ -86,7 +86,11 @@
android:name="JPUSH_CHANNEL"
android:value="${JPUSH_CHANNEL}" />
<activity android:name=".ui.activitys.SplashActivity">
<activity
android:name=".ui.activitys.SplashActivity"
android:configChanges="keyboard|orientation|screenSize"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......@@ -113,14 +117,15 @@
<activity
android:name=".ui.activitys.SettingsActivity"
android:screenOrientation="portrait" />
<activity android:name=".ui.activitys.AboutusActivity"
android:screenOrientation="portrait"/>
<activity android:name=".ui.activitys.GuideActivity"/>
<activity android:name=".ui.activitys.LiebaoGameActivity"/>
<activity android:name=".ui.activitys.DrawcashActivity"/>
<activity android:name=".ui.activitys.WaterActivity"/>
<activity android:name=".ui.activitys.WalkActivity"/>
<activity android:name=".ui.activitys.EraseActivity"/>
<activity
android:name=".ui.activitys.AboutusActivity"
android:screenOrientation="portrait" />
<activity android:name=".ui.activitys.GuideActivity" />
<activity android:name=".ui.activitys.LiebaoGameActivity" />
<activity android:name=".ui.activitys.DrawcashActivity" />
<activity android:name=".ui.activitys.WaterActivity" />
<activity android:name=".ui.activitys.WalkActivity" />
<activity android:name=".ui.activitys.EraseActivity" />
<service
android:name=".service.UpdateService"
......
......@@ -96,8 +96,6 @@ object Constant {
const val CARRIER_WALK = "WALK" //走路
const val CARRIER_WALK_BUBBLE = "WALK_BUBBLE" //走路汽泡
const val CARRIER_NEW_USER = "CARRIER_NEW_USER" //新用户红包
const val CARRIER_FRIENDS = "CARRIER_FRIENDS" //邀请好友
const val SHAREFRIEND_COMPLETE_1 = "SHAREFRIEND_COMPLETE_1" //邀请任务1
const val SHAREFRIEND_COMPLETE_2 = "SHAREFRIEND_COMPLETE_2" //邀请任务2
......@@ -105,8 +103,6 @@ object Constant {
const val SHAREFRIEND_COMPLETE_4 = "SHAREFRIEND_COMPLETE_4" //邀请任务4
const val SHAREFRIEND_COMPLETE_5 = "SHAREFRIEND_COMPLETE_5" //邀请任务5
const val SHAREFRIEND_COMPLETE_6 = "SHAREFRIEND_COMPLETE_6" //邀请任务6
// 新邀请好友
const val CHALLENGE_SHAREFRIEND = "CHALLENGE_SHAREFRIEND" //邀请好友
......
......@@ -64,7 +64,10 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
startTime()
when (carrierType) {
Constant.CARRIER_HOMEVEDIO_SMALL,Constant.CHALLENGE_SHAREFRIEND -> {
Constant.CARRIER_HOMEVEDIO_SMALL, Constant.CHALLENGE_SHAREFRIEND,
Constant.SHAREFRIEND_COMPLETE_1, Constant.SHAREFRIEND_COMPLETE_2,
Constant.SHAREFRIEND_COMPLETE_3, Constant.SHAREFRIEND_COMPLETE_4,
Constant.SHAREFRIEND_COMPLETE_5, Constant.SHAREFRIEND_COMPLETE_6 -> {
val vo = HashMap<String, Any>()
vo["carrierType"] = carrierType
awardPresenter.reportAddCoinMsg(vo)
......@@ -145,7 +148,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
when (carrierType) {
// 只有看视频才能领金币
Constant.CARRIER_OFFLINE_DOUBLE, Constant.CARRIER_SIGNIN_HOMEPAGE_CARD,
Constant.CARRIER_CHALLENGE_TURN,Constant.CARRIER_CHALLENGE_CARD,
Constant.CARRIER_CHALLENGE_TURN, Constant.CARRIER_CHALLENGE_CARD,
Constant.CARRIER_VERSUS_VIDEO, Constant.CARRIER_WALK_BUBBLE -> {
// awardVedio()
finish()
......
......@@ -2,9 +2,7 @@ package com.mints.goodmoney.ui.fragment
import android.os.Bundle
import android.text.TextUtils
import android.view.View.OnLongClickListener
import android.webkit.WebChromeClient
import com.github.lzyzsd.jsbridge.BridgeHandler
import com.github.lzyzsd.jsbridge.CallBackFunction
import com.github.lzyzsd.jsbridge.DefaultHandler
import com.mints.goodmoney.BuildConfig
......@@ -39,7 +37,6 @@ class PanFragment : BaseFragment(), PanView {
override fun initViewsAndEvents() {
panPresenter.attachView(this)
}
override fun onHiddenChanged(hidden: Boolean) {
......@@ -88,6 +85,8 @@ class PanFragment : BaseFragment(), PanView {
bundle.putString(Constant.MAIN_CARRIER_TYPE, carrierType)
bundle.putString(Constant.MAIN_EXTRA_ID, turntableBean.key)
readyGo(AwardActivity::class.java, bundle)
androidCallJsReferse()
}
}
blTurntableWebview.setDefaultHandler(object : DefaultHandler() {
......
......@@ -55,6 +55,7 @@
android:layout_height="match_parent"
android:layout_weight="1.0"
android:gravity="center"
android:visibility="gone"
android:orientation="vertical">
<ImageView
......
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