代码优化

video/app/src/main/java/com/duben/heliapp/ui/widgets/VipDialog.kt

@@ -295,6 +295,29 @@ class VipDialog(
         if (vipList != null && vipList!!.size > 0) {
             setVipContent(vipList!![position])
         }
+
+        if (!isCheckAgreeFlag) {
+            showToast("请勾选《会员付费协议》")
+            return
+        }
+
+        if (vipList != null && vipList!!.size > 0) {
+            val vipBean = vipList!![vipAdapter.getPosition()]
+
+            if (TextUtils.equals(payType, VipActivity.WEIXIN_PAY)) {
+                vipPresenter.getVipPayParams(
+                    "WEIXIN",
+                    vipBean.pid, true
+                )
+            } else if (TextUtils.equals(payType, VipActivity.ALIPAY)) {
+                vipPresenter.getVipPayParams(
+                    "ALIPAY",
+                    vipBean.pid, true
+                )
+            }
+        } else {
+            showToast("产品未配置")
+        }
     }
 
     fun wxPay(wxParanBean: WxPayParamBean) {

video/app/src/main/res/layout/dialog_vip.xml

@@ -141,6 +141,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="6dp"
+            android:layout_marginBottom="10dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -162,12 +163,12 @@
         </LinearLayout>
 
         <io.supercharge.shimmerlayout.ShimmerLayout
+            android:visibility="gone"
             android:id="@+id/shimmer_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginLeft="40dp"
-            android:layout_marginTop="10dp"
             android:layout_marginRight="40dp"
             android:layout_marginBottom="10dp"
             app:shimmer_animation_duration="1200"

video/gradle.properties

@@ -21,8 +21,8 @@ android.nonTransitiveRClass=true
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-#DEBUG_URL="https://test.mints-id.com/camera-api/"
-#DEBUG_URL="http://cui.mints-id.com/"
+#DEBUG_URL="https://test.mints-id.com/camera-api/api/"
+#DEBUG_URL="http://cui.mints-id.com/api/"
 DEBUG_URL="https://api.mints-tech.cn/camera-api/api/"
 RELEASE_URL="https://api.mints-tech.cn/camera-api/api/"
 
@@ -44,10 +44,10 @@ WEIXIN_APP_SECRET =93add1e49825bd4992ba8b6792630a7d
 RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
 
 #TalkingData
-RELEASE_TALKING_DATA_KEY="2E0D42A54FCD4C059EAF9EFDDEA9FBCE"
+RELEASE_TALKING_DATA_KEY="953575B247E8445090F9823ED5EB6497"
 
 
-GROMORE_APP_ID="5423461"
+GROMORE_APP_ID="5421234"
 GROMORE_SPLASH_CODE="102418768"
 GROMORE_VIDEO_CODE="102418861"
 GROMORE_EXPRESS_CODE="102419307"