Skip to content

A
android_vedio
Commit 748e137e authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

解决冲突

parent 87a07482
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
video/app/src/main/java/com/mints/wisdomclean/mvp/model/HotStyleListBean.kt
View file @ 748e137e
...@@ -5,9 +5,11 @@ import android.os.Parcelable ...@@ -5,9 +5,11 @@ import android.os.Parcelable
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
import java.io.Serializable import java.io.Serializable
@SuppressLint("ParcelCreator")
@Parcelize
data class HotStyleListBean( data class HotStyleListBean(
val list: List<HotStyleBean> val list: List<HotStyleBean>
) : Serializable ) : Parcelable
@SuppressLint("ParcelCreator") @SuppressLint("ParcelCreator")
@Parcelize @Parcelize
...@@ -39,7 +41,9 @@ data class HotStyleTypesBean( ...@@ -39,7 +41,9 @@ data class HotStyleTypesBean(
var imageCount: Int = -1, var imageCount: Int = -1,
) : Parcelable ) : Parcelable
@SuppressLint("ParcelCreator")
@Parcelize
data class HotStyleMsgBean( data class HotStyleMsgBean(
val images: List<HotStyleBean>, val images: List<HotStyleBean>,
val types: List<HotStyleTypesBean> val types: List<HotStyleTypesBean>
) : Serializable ) : Parcelable
\ No newline at end of file
video/gradle.properties
View file @ 748e137e
...@@ -40,7 +40,11 @@ WEIXIN_APP_ID =wx6830d86ba20be254 ...@@ -40,7 +40,11 @@ WEIXIN_APP_ID =wx6830d86ba20be254
WEIXIN_APP_SECRET =91f91c0721bd989cf8b9c9b8dc8a5e9c WEIXIN_APP_SECRET =91f91c0721bd989cf8b9c9b8dc8a5e9c
#umeng #umeng
<<<<<<< Updated upstream
RELEASE_UMENG_KEY=64a67d4fa1a164591b44f0e8 RELEASE_UMENG_KEY=64a67d4fa1a164591b44f0e8
=======
RELEASE_UMENG_KEY=63c0fd97d64e68613917170f
>>>>>>> Stashed changes
GROMORE_APP_ID="5404192" GROMORE_APP_ID="5404192"
GROMORE_SPLASH_CODE="102371299" GROMORE_SPLASH_CODE="102371299"
......
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