Commit 8abb05b4 by Dell

1、调整部分sp

2、直播间修改
parent 67df8a04
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="11.5sp" android:textSize="11.5dp"
android:visibility="gone" android:visibility="gone"
mv:mv_backgroundColor="#FD481F" mv:mv_backgroundColor="#FD481F"
mv:mv_isRadiusHalfHeight="true" mv:mv_isRadiusHalfHeight="true"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
android:layout_toRightOf="@+id/ll_tap" android:layout_toRightOf="@+id/ll_tap"
android:gravity="center" android:gravity="center"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="11.5sp" android:textSize="11.5dp"
android:visibility="gone" android:visibility="gone"
mv:mv_backgroundColor="#FD481F" mv:mv_backgroundColor="#FD481F"
mv:mv_isRadiusHalfHeight="true" mv:mv_isRadiusHalfHeight="true"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="11.5sp" android:textSize="11.5dp"
android:visibility="gone" android:visibility="gone"
mv:mv_backgroundColor="#FD481F" mv:mv_backgroundColor="#FD481F"
mv:mv_isRadiusHalfHeight="true" mv:mv_isRadiusHalfHeight="true"
......
...@@ -42,56 +42,54 @@ android { ...@@ -42,56 +42,54 @@ android {
} }
flavorDimensions "version" flavorDimensions "version"
productFlavors { productFlavors {
productFlavors { qj_01 {
qj_01 { manifestPlaceholders = [
manifestPlaceholders = [ API_CHANNEL_ID : "0",
API_CHANNEL_ID : "0", UMENG_CHANNEL_VALUE: "qj_01"
UMENG_CHANNEL_VALUE: "qj_01" ]
] }
} qj_02 {
qj_02 { manifestPlaceholders = [UMENG_CHANNEL_VALUE: "qj_02"]
manifestPlaceholders = [UMENG_CHANNEL_VALUE: "qj_02"] }
} qj_baidu {
qj_baidu { manifestPlaceholders = [
manifestPlaceholders = [ API_CHANNEL_ID : "3",
API_CHANNEL_ID : "3", UMENG_CHANNEL_VALUE: "qj_baidu"
UMENG_CHANNEL_VALUE: "qj_baidu" ]
] }
} qj_huawei_01 {
qj_huawei_01 {
manifestPlaceholders = [ manifestPlaceholders = [
API_CHANNEL_ID : "4", API_CHANNEL_ID : "4",
UMENG_CHANNEL_VALUE: "qj_huawei_01" UMENG_CHANNEL_VALUE: "qj_huawei_01"
] ]
} }
qj_xiaomi_01 { qj_xiaomi_01 {
manifestPlaceholders = [ manifestPlaceholders = [
API_CHANNEL_ID : "6", API_CHANNEL_ID : "6",
UMENG_CHANNEL_VALUE: "qj_xiaomi_01" UMENG_CHANNEL_VALUE: "qj_xiaomi_01"
] ]
} }
qj_vivo_01 { qj_vivo_01 {
manifestPlaceholders = [ manifestPlaceholders = [
API_CHANNEL_ID : "7", API_CHANNEL_ID : "7",
UMENG_CHANNEL_VALUE: "qj_vivo_01" UMENG_CHANNEL_VALUE: "qj_vivo_01"
] ]
} }
qj_oppo_01 { qj_oppo_01 {
manifestPlaceholders = [ manifestPlaceholders = [
API_CHANNEL_ID : "8", API_CHANNEL_ID : "8",
UMENG_CHANNEL_VALUE: "qj_oppo_01" UMENG_CHANNEL_VALUE: "qj_oppo_01"
] ]
} }
qj_sanxing_01 { qj_sanxing_01 {
manifestPlaceholders = [ manifestPlaceholders = [
API_CHANNEL_ID : "9", API_CHANNEL_ID : "9",
UMENG_CHANNEL_VALUE: "qj_sanxing_01" UMENG_CHANNEL_VALUE: "qj_sanxing_01"
] ]
}
} }
} }
......
...@@ -238,6 +238,7 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta ...@@ -238,6 +238,7 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
if (code == 200) { if (code == 200) {
initTabLayout() initTabLayout()
} else { } else {
initTabLayout(false)
addMessage("环信登录失败:code : $code error : $error") addMessage("环信登录失败:code : $code error : $error")
if (code == 204) { if (code == 204) {
CommonUtils.copy(userName) CommonUtils.copy(userName)
......
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