Skip to content

L
LuckyFarm
Commit 13b3b639 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

美食大亨1.0.2代码上线

parent 00bd71b0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 187 deletions
.idea/jarRepositories.xml
View file @ 13b3b639
......@@ -46,5 +46,10 @@
<option name="name" value="maven3" />
<option name="url" value="http://zx-maven.huolea.com/repository/admodule/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven4" />
<option name="name" value="maven4" />
<option name="url" value="https://dl.bintray.com/mintegral-official/Andorid_ad_SDK_for_china" />
</remote-repository>
</component>
</project>
\ No newline at end of file
.idea/misc.xml
View file @ 13b3b639
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
app/src/main/java/com/ym/msdh/game/GameActivity.kt
View file @ 13b3b639
......@@ -159,8 +159,8 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
//头像跳转
fun onclickHead() {
JumpUtils.jumpUserInfoActivity()
// JumpUtils.jumpUserInfoActivity()
JumpUtils.jumpSettingActivity()
// GameDialog.showAccelerator(this@GameActivity,10,object :View.OnClickListener {
// GameDialog.showProduceGourmet(this@GameActivity,20,0,object :View.OnClickListener {
// override fun onClick(p0: View?) {
......@@ -795,12 +795,13 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
//订单数据
fun getOrderData(callback: IUnitySendMessageCallback?) {
GameApiClient.gameApi.getHomeWList().compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<OrderEntity>() {
override fun onSuccess(result: OrderEntity?) {
.subscribe(object : BaseObserver<List<HomeListEntity>>() {
override fun onSuccess(result: List<HomeListEntity>?) {
mOrderString = Utils.obj2Str(result)
Log.d("wxw", "订单数据" + Utils.obj2Str(result))
callback?.onOrderListSuccess(
true, Utils.obj2Str(result)
true,
"{\"homeList\":" + Utils.obj2Str(result) + "}"
)
}
......@@ -1252,17 +1253,17 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
Log.e("MXL","asda")
EventUtils.onEvent("dingdan_click")
GameApiClient.gameApi.getHomeWList().compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<OrderEntity>() {
override fun onSuccess(result: OrderEntity?) {
.subscribe(object : BaseObserver<List<HomeListEntity>>() {
override fun onSuccess(result: List<HomeListEntity>?) {
Log.d("wxw", "订单数据" + Utils.obj2Str(result))
if (result != null) {
OrderDialog.show(this@GameActivity, result)
// OrderDialog.show(this@GameActivity, result)
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "订单数据 error")
// Log.d("wxw", "订单数据 error")
}
})
......
app/src/main/java/com/ym/msdh/game/adapter/CashExchangeAdapter.kt
View file @ 13b3b639
......@@ -45,10 +45,10 @@ class CashExchangeAdapter :
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
var bean = mList[position]
if (bean.type == 4) {
holder.item_mark?.visibility = View.VISIBLE
holder.item_mark?.visibility = View.GONE
holder.item_mark?.setImageResource(R.mipmap.icon_fuli)
} else if (bean.type == 1) {
holder.item_mark?.visibility = View.VISIBLE
holder.item_mark?.visibility = View.GONE
holder.item_mark?.setImageResource(R.mipmap.icon_xinshou)
} else {
holder.item_mark?.visibility = View.GONE
......@@ -76,16 +76,16 @@ class CashExchangeAdapter :
} else {
when (bean.id) {
1 -> {
EventUtils.onEvent("click_baicai", "白菜" + bean.cash)
EventUtils.onEvent("click_shaokao", "烧烤" + bean.cash)
}
2 -> {
EventUtils.onEvent("click_fanqie", "番茄" + bean.cash)
EventUtils.onEvent("click_jianbing", "煎饼" + bean.cash)
}
3 -> {
EventUtils.onEvent("click_nangua", "南瓜" + bean.cash)
EventUtils.onEvent("click_tangguo", "糖果" + bean.cash)
}
4 -> {
EventUtils.onEvent("click_luobo", "萝卜" + bean.cash)
EventUtils.onEvent("click_dangao", "蛋糕" + bean.cash)
}
}
}
......
app/src/main/java/com/ym/msdh/game/application/BaseApplication.kt
View file @ 13b3b639
......@@ -58,7 +58,7 @@ class BaseApplication : BaseApplication() {
// NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
//TODO 上线去掉测试地址
// NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
// NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
//AdManager.init(this,"afcbef40e31631d3")
AdManager.init(this,"b1c85b22f06d1990")
......
app/src/main/java/com/ym/msdh/game/presenter/ClockInWithdrawPresenter.kt
View file @ 13b3b639
......@@ -62,20 +62,20 @@ class ClockInWithdrawPresenter : ClockInWithdrawContract.Presenter {
var type = result.type
if (type != null) {
EventUtils.onEvent("attendance_task_box_receive_dialog_show")
GameDialog.showGetCash(activity,0,result.awardNum!!,View.OnClickListener {
})
// MainDialog.showopenBox(
// activity, type,
// "宝箱奖励",
// "${result.awardNum ?: 0}",
// result,
// object : IDialogViewCloseCallback {
// override fun onCloseViewSuccess(isSuccess: Boolean) {
// GameDialog.showGetCash(activity,0,result.awardNum!!,View.OnClickListener {
//
// }
// }
// )
// })
MainDialog.showopenBox(
activity, type,
"宝箱奖励",
"${result.awardNum ?: 0}",
result,
object : IDialogViewCloseCallback {
override fun onCloseViewSuccess(isSuccess: Boolean) {
}
}
)
}
}
}
......
app/src/main/java/com/ym/msdh/game/view/CashExchangeDialog.kt
View file @ 13b3b639
......@@ -34,7 +34,7 @@ object CashExchangeDialog : CashExchangeContract.View {
return
}
this.context = context
EventUtils.onEvent("show_duihuan_cash_dialog", "兑换现金")
EventUtils.onEvent("duihuan_show", "兑换现金")
mPresenter = CashExchangePresenter(this)
mPresenter?.getWithDrawList()
RxBusUtil.getDefault().register(this)
......
app/src/main/res/layout/dialog_layout_cash_exchage.xml
View file @ 13b3b639
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="600dp"
android:layout_centerInParent="true"
android:layout_marginLeft="9dp"
android:layout_marginRight="9dp">
android:layout_width="334dp"
android:layout_height="526dp"
android:layout_gravity="center">
<ImageView
android:layout_width="match_parent"
android:layout_height="532dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@mipmap/icon_main_dialog_get_drops_bg" />
android:background="@mipmap/icon_duihuan_bg" />
<RelativeLayout
<ImageView
android:id="@+id/iv_dialog_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="0dp"
android:src="@mipmap/icon_new_close" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_cash_exchage"
android:layout_width="match_parent"
android:layout_height="577dp"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10">
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_80"
android:layout_marginRight="@dimen/dp_23"
android:layout_marginBottom="@dimen/dp_30" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_dialog_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="62dp"
android:src="@mipmap/icon_new_close" />
android:layout_centerHorizontal="true"
android:src="@mipmap/icon_cash_desc"
android:visibility="gone" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/icon_exchage_cash_bg" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/iv_dialog_close"
android:layout_marginTop="-5dp">
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/id_mg_cash_recode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_cash_exchage"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@mipmap/icon_cash_desc"
android:visibility="gone"/>
android:layout_alignParentRight="true"
android:src="@mipmap/icon_cash_recode"
android:visibility="gone" />
</RelativeLayout>
<ImageView
android:id="@+id/id_mg_cash_recode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@mipmap/icon_cash_recode" />
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
app/src/main/res/layout/item_with_draw_list.xml
View file @ 13b3b639
......@@ -4,68 +4,58 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/withdraw_bg"
android:orientation="horizontal"
android:padding="4dp">
<RelativeLayout
android:layout_width="70dp"
android:layout_height="70dp">
<!-- android:src="@mipmap/icon_item_cash_bg"-->
android:layout_marginBottom="@dimen/dp_30"
android:orientation="horizontal">
<!-- android:src="@mipmap/icon_item_cash_bg"-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView
android:id="@+id/id_img_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_width="46dp"
android:layout_height="@dimen/dp_44"
android:src="@mipmap/baicai_fruit" />
<ImageView
android:id="@+id/id_img_mark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_img_icon"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp_18"
android:src="@mipmap/icon_fuli" />
android:src="@mipmap/icon_fuli"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:gravity="center_vertical">
<TextView
android:id="@+id/id_tv_chazhi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
android:text="fdafas"
android:textColor="#642D2D"
android:layout_marginBottom="@dimen/dp_6"
android:includeFontPadding="false"
android:singleLine="true"
android:text=""
android:textColor="#94491A"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="15dp">
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/progess_with_draw_item"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="15dp"
android:layout_width="142dp"
android:layout_height="@dimen/dp_10"
android:progressDrawable="@drawable/user_item_progressbar_bg" />
<TextView
......@@ -74,38 +64,42 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginBottom="-6dp"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="15sp" />
android:textSize="10sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="68dp"
android:gravity="center"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<TextView
android:id="@+id/id_tv_cash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
android:text=""
android:textColor="#ED5430"
android:textSize="@dimen/sp_20"
android:textColor="#FC6002"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text=""
android:textColor="#ED5430"
android:textSize="@dimen/sp_14" />
android:textColor="#FC6002"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
</LinearLayout>
<ImageView
......
app/version.properties
View file @ 13b3b639
PACKAGE_NAME=com.ym.msdh
VERSION_CODE=2
VERSION_NAME=1.0.1
\ No newline at end of file
VERSION_CODE=3
VERSION_NAME=1.0.2
\ No newline at end of file
library/src/main/java/com/ym/library/net/IGameApi.kt
View file @ 13b3b639
......@@ -354,7 +354,7 @@ interface IGameApi {
* @return
*/
@GET(NetConfig.Game.URL_GAME_ORDER_LIST)
fun getHomeWList(): Observable<Response<OrderEntity>>
fun getHomeWList(): Observable<Response<List<HomeListEntity>>>
/**
* 看领金币视频任务
......
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ 13b3b639
......@@ -271,7 +271,7 @@ public class NetConfig {
public static final String URL_COLLECT_CARD_ADV_PUT_OR_ADD = "app/v1/collect-card/advPutOrAdd";//看广告单个图片获取或者拼图
public static final String URL_COLLECT_CARD_ADD_CARD = "app/v1/collect-card/addCard";//收金币获得卡片
// public static final String URL_GAME_HOME_WD_LIST = "app/v1/game/ddcy/home_wd_list";//首页展示果实列表
public static final String URL_CLOCK_BOX_RECEIVE = "app/v1/game/clock_receive";//打卡普通打卡任务领取
public static final String URL_CLOCK_BOX_RECEIVE = "app/v1/game/ddcy/clock_box_receive";//打卡普通打卡任务领取
public static final String URL_GAME_VIDEO_TASK_COMPLETE = "app/v1/game/video_task_complete";//看领金币视频任务
public static final String URL_GAME_WAREHOUSEDATA = "app/v1/game/ddcy/warehouseData";//仓库列表
......@@ -284,9 +284,9 @@ public class NetConfig {
// public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land_V2";//花园 解锁地块/种植种子/收获果实/解锁倒计时
public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/msdh/unlock_shop";//美食大亨 解锁地块/种植种子/收获果实/解锁倒计时
public static final String URL_GAME_ORDER_LIST = "app/v1/game/farm/order_data";//美食大亨 订单列表
public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddhy/withdraw_list";//兑换列表
public static final String URL_GAME_DOWD = "app/v1/game/ddhy/do_wd";//兑换接口
public static final String URL_GAME_ORDER_LIST = "app/v1/game/msdh/list_order";//美食大亨 订单列表
public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/msdh/exchange_list";//兑换列表
public static final String URL_GAME_DOWD = "app/v1/game/msdh/exchange_wd";//兑换接口
public static final String URL_FORCE_POST = "app/v1/game/farm/force_post";//拆红包不看视频翻倍上报接口
}
}
library/src/main/res/layout/dialog_layout_get_box.xml
View file @ 13b3b639
......@@ -35,7 +35,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="72dp"
android:includeFontPadding="false"
android:text="随机获得现金、金币、加速器"
android:text="随机获得金币、加速器"
android:textColor="#095100"
android:textSize="17sp" />
......
userinfo/src/main/res/drawable/user_item_progressbar_bg.xml
View file @ 13b3b639
......@@ -3,8 +3,8 @@
<!-- 设置背景色 -->
<item android:id="@android:id/background">
<shape>
<corners android:radius="8dp" />
<solid android:color="#A45D33" />
<corners android:radius="6dp" />
<solid android:color="#A45D00" />
</shape>
</item>
......@@ -12,8 +12,8 @@
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="8dp" />
<solid android:color="#94CA46" />
<corners android:radius="6dp" />
<solid android:color="#68CB00" />
</shape>
</clip>
</item>
......
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