diff --git a/app/src/main/java/com/yizhuan/habu/application/XChatApplication.java b/app/src/main/java/com/yizhuan/habu/application/XChatApplication.java index cfcbf504c..c3d2dd217 100644 --- a/app/src/main/java/com/yizhuan/habu/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/habu/application/XChatApplication.java @@ -401,7 +401,7 @@ public class XChatApplication extends BaseApp { httpParams.put("androidId", MD5Utils.getMD5String(Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID))); httpParams.put("channel", AppMetaDataUtil.getChannelID()); RxNet.init(context) - .debug(BuildConfig.DEBUG) + .debug(true) .setBaseUrl(url) .addInterceptors(new ParamsInterceptor(httpParams)) .addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序 diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt b/app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt index bdd629e48..8383273bb 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt @@ -81,37 +81,37 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic } } } - homeViewModel.currentResourceLiveData.observe(this) { - it?.let { - if(it.size != 2){ - binding.csResource.visibility = View.GONE - return@observe - } - binding.csResource.visibility = View.VISIBLE - val resourceViews = arrayOf( - binding.ivResource0, - binding.ivResource1 - ) - for (i in resourceViews.indices) { - resourceViews[i].load(it[i].icon) - resourceViews[i].setOnClickListener { _ -> - when { - it[i].resourceType == 5 -> { - CommonWebViewActivity.start(context, it[i].resourceContent) - } - i == 3 -> { - dialogManager.showProgressDialog(mContext) - homeViewModel.getHomeChatPick() - } - else -> { - dialogManager.showProgressDialog(mContext) - homeViewModel.getResourceJumpInfo(it[i].id) - } - } - } - } - } - } +// homeViewModel.currentResourceLiveData.observe(this) { +// it?.let { +// if(it.size != 2){ +// binding.csResource.visibility = View.GONE +// return@observe +// } +// binding.csResource.visibility = View.VISIBLE +// val resourceViews = arrayOf( +// binding.ivResource0, +// binding.ivResource1 +// ) +// for (i in resourceViews.indices) { +// resourceViews[i].load(it[i].icon) +// resourceViews[i].setOnClickListener { _ -> +// when { +// it[i].resourceType == 5 -> { +// CommonWebViewActivity.start(context, it[i].resourceContent) +// } +// i == 3 -> { +// dialogManager.showProgressDialog(mContext) +// homeViewModel.getHomeChatPick() +// } +// else -> { +// dialogManager.showProgressDialog(mContext) +// homeViewModel.getResourceJumpInfo(it[i].id) +// } +// } +// } +// } +// } +// } homeViewModel.resourceJumpLiveData.observe(this) { dialogManager.dismissDialog() it?.let { @@ -132,7 +132,7 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic } } homeViewModel.getBannerInfo() - homeViewModel.getCurrentResourceInfo() +// homeViewModel.getCurrentResourceInfo() } private fun initListener() { diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f5419aa81..efa32939c 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -93,6 +93,8 @@ android:layout_width="@dimen/dp_0" android:layout_height="0dp" android:scaleType="centerCrop" + android:visibility="gone" + tools:visibility="visible" app:layout_constraintDimensionRatio="170:82" app:layout_constraintEnd_toStartOf="@+id/iv_resource1" app:layout_constraintHorizontal_weight="1" @@ -103,6 +105,8 @@ - + + + + + + + + @@ -30,7 +40,7 @@ android:gravity="center_horizontal" android:singleLine="true" android:text="@string/common_loading_tips" - android:textColor="#C9BCF2" + android:textColor="#FFFFFF" android:textSize="14sp" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d565f50d4..4ba25ac44 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -62,10 +62,9 @@