Commit 2da62af3 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 4cd1f714
...@@ -441,11 +441,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -441,11 +441,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
mainHandler.postDelayed( mainHandler.postDelayed(
{ {
if (isFinishing) return@postDelayed if (isFinishing) return@postDelayed
// 挽留弹窗存在也不弹
if (payYesDialog != null && payYesDialog!!.isShowing) return@postDelayed
if (vipList != null && vipList!!.size > 0) {
val vipBean = vipList!![vipAdapter.getPosition()] val vipBean = vipList!![vipAdapter.getPosition()]
// 0.01 // 0.01
if (vipBean.trial != 0) { if (vipBean.trial != 0) {
showPayCancelDialog() showPayCancelDialog()
} }
}
}, },
2000 2000
) )
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:orientation="vertical"> android:orientation="vertical">
...@@ -39,6 +40,15 @@ ...@@ -39,6 +40,15 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold"></TextView> android:textStyle="bold"></TextView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="6dp"
android:text="工作时间 9:00-18:00"
android:textColor="@color/black"
android:textSize="14sp"></TextView>
<TextView <TextView
android:id="@+id/tv_phone_dialog_phone" android:id="@+id/tv_phone_dialog_phone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -48,6 +58,7 @@ ...@@ -48,6 +58,7 @@
android:text="点击拨打" android:text="点击拨打"
android:textColor="#828383" android:textColor="#828383"
android:textSize="14sp"></TextView> android:textSize="14sp"></TextView>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -56,7 +67,7 @@ ...@@ -56,7 +67,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="30dp" android:layout_marginTop="20dp"
android:layout_marginBottom="14dp" android:layout_marginBottom="14dp"
android:background="@drawable/shape_dialog" android:background="@drawable/shape_dialog"
android:paddingLeft="36dp" android:paddingLeft="36dp"
......
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