Commit 1e4580a5 authored by jyx's avatar jyx

修改圣于地珊瑚顺序配置,进度条显示不全

parent b4476efa
...@@ -27,7 +27,7 @@ public class TzTaskBean { ...@@ -27,7 +27,7 @@ public class TzTaskBean {
private String aid; private String aid;
public TzTaskBean(String icon, String title,String description, boolean isShCpd,int coin, int state, String downLoadPkgName) { public TzTaskBean(String icon, String title, String description, boolean isShCpd, int coin, int state, String downLoadPkgName) {
this.icon = icon; this.icon = icon;
this.title = title; this.title = title;
this.description = description; this.description = description;
...@@ -38,7 +38,7 @@ public class TzTaskBean { ...@@ -38,7 +38,7 @@ public class TzTaskBean {
this.downLoadPkgName = downLoadPkgName; this.downLoadPkgName = downLoadPkgName;
} }
public TzTaskBean(String icon, String title,int coin, int state, String currentPkgName,String aid) { public TzTaskBean(String icon, String title, int coin, int state, String currentPkgName, String aid) {
this.icon = icon; this.icon = icon;
this.title = title; this.title = title;
this.coin = coin; this.coin = coin;
...@@ -75,19 +75,19 @@ public class TzTaskBean { ...@@ -75,19 +75,19 @@ public class TzTaskBean {
this.app_url = app_url; this.app_url = app_url;
} }
// public CpdModelBean.DataBean.MaterialsBean.TrackerBean getTrackerBean() { public CpdModelBean.DataBean.MaterialsBean.TrackerBean getTrackerBean() {
// return trackerBean; return trackerBean;
// } }
//
// public void setTrackerBean(CpdModelBean.DataBean.MaterialsBean.TrackerBean trackerBean) { public void setTrackerBean(CpdModelBean.DataBean.MaterialsBean.TrackerBean trackerBean) {
// this.trackerBean = trackerBean; this.trackerBean = trackerBean;
// } }
public SydCpdListBean.DataBean.MaterialsBean.TrackerBean getTrackerBean() { public SydCpdListBean.DataBean.MaterialsBean.TrackerBean getTrackerListBean() {
return trackerListBean; return trackerListBean;
} }
public void setTrackerBean(SydCpdListBean.DataBean.MaterialsBean.TrackerBean trackerListBean) { public void setTrackerListBean(SydCpdListBean.DataBean.MaterialsBean.TrackerBean trackerListBean) {
this.trackerListBean = trackerListBean; this.trackerListBean = trackerListBean;
} }
...@@ -143,19 +143,4 @@ public class TzTaskBean { ...@@ -143,19 +143,4 @@ public class TzTaskBean {
this.currentPkgName = currentPkgName; this.currentPkgName = currentPkgName;
} }
@Override
public String toString() {
return "TzTaskBean{" +
"icon='" + icon + '\'' +
", title='" + title + '\'' +
", description='" + description + '\'' +
", app_url='" + app_url + '\'' +
", isShCpd=" + isShCpd +
", coralAd=" + coralAd +
", trackerBean=" + trackerBean +
", coin=" + coin +
", state=" + state +
", currentPkgName='" + currentPkgName + '\'' +
'}';
}
} }
...@@ -43,8 +43,13 @@ class TaskPresenter : BasePresenter<TaskView>() { ...@@ -43,8 +43,13 @@ class TaskPresenter : BasePresenter<TaskView>() {
when (code) { when (code) {
200 -> { 200 -> {
if (data != null) { if (data != null) {
view.getShCpdTimeSuc(data.get("needSeconds").asInt, data.get("coin").asInt, view.getShCpdTimeSuc(
data.get("CPD").asInt, data.get("CPD_SYD").asInt) data.get("needSeconds").asInt,
data.get("coin").asInt,
data.get("CPD").asInt,
data.get("CPD_SYD").asInt,
data.get("cpdOrder").asString
)
} }
} }
} }
...@@ -104,9 +109,9 @@ class TaskPresenter : BasePresenter<TaskView>() { ...@@ -104,9 +109,9 @@ class TaskPresenter : BasePresenter<TaskView>() {
}) })
} }
fun getCpdListDetail(ip: String,number:Int) { fun getCpdListDetail(ip: String, number: Int) {
AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
.call(CpdService.Factory.getInstance().getAdVedio(CpdManager.getCpdLisrUrl(), CpdManager.getCpdListBody(ip,number)), .call(CpdService.Factory.getInstance().getAdVedio(CpdManager.getCpdLisrUrl(), CpdManager.getCpdListBody(ip, number)),
object : BaseSubscriber<JsonObject>() { object : BaseSubscriber<JsonObject>() {
override fun onCompleted() { override fun onCompleted() {
} }
......
...@@ -4,7 +4,7 @@ import com.mints.goodmoney.mvp.model.CpdModelBean ...@@ -4,7 +4,7 @@ import com.mints.goodmoney.mvp.model.CpdModelBean
import com.mints.goodmoney.mvp.model.SydCpdListBean import com.mints.goodmoney.mvp.model.SydCpdListBean
interface TaskView : BaseView { interface TaskView : BaseView {
fun getShCpdTimeSuc(time: Int, coin: Int, CPD: Int, CPD_SYD: Int) fun getShCpdTimeSuc(time: Int, coin: Int, CPD: Int, CPD_SYD: Int, CPD_ORDER: String?)
fun getCpdModelSuc(dataBean: CpdModelBean.DataBean) fun getCpdModelSuc(dataBean: CpdModelBean.DataBean)
......
...@@ -377,10 +377,12 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener { ...@@ -377,10 +377,12 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
AppConfig.isSuperTask = false AppConfig.isSuperTask = false
if (mReceiverBroadcastReceiver != null) { if (mReceiverBroadcastReceiver != null) {
if (mReceiverBroadcastReceiver!!.isInitialStickyBroadcast) {
mContext.stopService(Intent(context, AppInstallService::class.java)) mContext.stopService(Intent(context, AppInstallService::class.java))
mContext.unregisterReceiver(mReceiverBroadcastReceiver) mContext.unregisterReceiver(mReceiverBroadcastReceiver)
mReceiverBroadcastReceiver = null mReceiverBroadcastReceiver = null
} }
}
awardPresenter.setHighTaskType("0") awardPresenter.setHighTaskType("0")
......
...@@ -2,11 +2,11 @@ package com.mints.goodmoney.ui.fragment ...@@ -2,11 +2,11 @@ package com.mints.goodmoney.ui.fragment
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Dialog
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
...@@ -34,14 +34,11 @@ import com.mints.goodmoney.ui.adapter.GvMyAdapter ...@@ -34,14 +34,11 @@ import com.mints.goodmoney.ui.adapter.GvMyAdapter
import com.mints.goodmoney.ui.adapter.MainMyAdapter import com.mints.goodmoney.ui.adapter.MainMyAdapter
import com.mints.goodmoney.ui.adapter.listener.OnItemChildClickListener import com.mints.goodmoney.ui.adapter.listener.OnItemChildClickListener
import com.mints.goodmoney.ui.fragment.base.BaseFragment import com.mints.goodmoney.ui.fragment.base.BaseFragment
import com.mints.goodmoney.ui.widgets.dialog.DialogListener
import com.mints.goodmoney.ui.widgets.ShareDialog import com.mints.goodmoney.ui.widgets.ShareDialog
import com.mints.goodmoney.ui.widgets.dialog.DialogListener
import com.mints.goodmoney.ui.widgets.dialog.DialogUtils import com.mints.goodmoney.ui.widgets.dialog.DialogUtils
import com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils import com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils
import com.mints.goodmoney.utils.AppUtil import com.mints.goodmoney.utils.*
import com.mints.goodmoney.utils.LogUtil
import com.mints.goodmoney.utils.QQJumpUtil
import com.mints.goodmoney.utils.SpanUtils
import com.mints.library.net.netstatus.NetUtils import com.mints.library.net.netstatus.NetUtils
import com.mints.library.utils.CommonUtils import com.mints.library.utils.CommonUtils
import com.mints.library.utils.GlideUtils import com.mints.library.utils.GlideUtils
...@@ -721,7 +718,7 @@ class MyFragment : BaseFragment(), ...@@ -721,7 +718,7 @@ class MyFragment : BaseFragment(),
0 -> { 0 -> {
// 牧场人生包名 // 牧场人生包名
pkgMCRSCarrier = Constant.CARRIER_MC_FIRSTDOWNLOAD pkgMCRSCarrier = Constant.CARRIER_MC_FIRSTDOWNLOAD
pkgMCRSKey="" pkgMCRSKey = ""
pkgMCRSName = taskBean.otherConfig.pkg pkgMCRSName = taskBean.otherConfig.pkg
// 下载牧场人生 // 下载牧场人生
...@@ -1157,7 +1154,7 @@ class MyFragment : BaseFragment(), ...@@ -1157,7 +1154,7 @@ class MyFragment : BaseFragment(),
} }
private fun initExpress(flowAdRules: FlowAdRulesBean) { private fun initExpress(flowAdRules: FlowAdRulesBean) {
PreLoadExpressManager.init(flowAdRules.csj,flowAdRules.ylh,flowAdRules.ks) PreLoadExpressManager.init(flowAdRules.csj, flowAdRules.ylh, flowAdRules.ks)
} }
/** /**
...@@ -1305,7 +1302,7 @@ class MyFragment : BaseFragment(), ...@@ -1305,7 +1302,7 @@ class MyFragment : BaseFragment(),
myPresenter.setHighTaskType(Constant.CARRIER_HIGH_ACTIVITY, "3") myPresenter.setHighTaskType(Constant.CARRIER_HIGH_ACTIVITY, "3")
} else if (TextUtils.equals(pkg, pkgMCRSName)) { } else if (TextUtils.equals(pkg, pkgMCRSName)) {
// 上报后台更新按钮状态 // 上报后台更新按钮状态
myPresenter.setHighTaskType(pkgMCRSCarrier, "1",pkgMCRSKey) myPresenter.setHighTaskType(pkgMCRSCarrier, "1", pkgMCRSKey)
} }
} catch (e: Exception) { } catch (e: Exception) {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/my_profile_tracker" android:id="@+id/my_profile_tracker"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:indeterminateOnly="false" android:indeterminateOnly="false"
......
...@@ -30,9 +30,7 @@ ...@@ -30,9 +30,7 @@
android:textColor="@color/color_333" android:textColor="@color/color_333"
android:textSize="14sp" /> android:textSize="14sp" />
<View <View style="@style/line_1" />
style="@style/line_1"
android:layout_above="@+id/dialog_ll_bottom" />
<include <include
android:id="@+id/pb_du_updating" android:id="@+id/pb_du_updating"
......
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