添加我的订单页，首页添加联系客服

video/app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.duben.happyplaylet"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 16
-        versionName "1.1.5"
+        versionCode 17
+        versionName "1.1.6"
         flavorDimensions "default"
 
         // dex突破65535的限制

video/app/src/main/java/com/duben/happyplaylet/ui/activitys/MainActivity.kt

@@ -93,7 +93,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
 
 
         initEditView()
-//        initEasyFloat()
+        initEasyFloat()
 //        initRefundEasyFloat()
         showFloat()
     }
@@ -401,10 +401,10 @@ class MainActivity : BaseActivity(), View.OnClickListener {
     private fun showFloat() {
         if (UserManager.getInstance().vipFlag && AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_ONE) {
 //            EasyFloat.show(this, "refund")
-//            EasyFloat.show(this, "contact")
+            EasyFloat.show(this, "contact")
         } else {
 //            EasyFloat.hide(this, "refund")
-//            EasyFloat.hide(this, "contact")
+            EasyFloat.hide(this, "contact")
         }
     }
 

video/app/src/main/java/com/duben/happyplaylet/ui/fragment/MyFragment.kt

@@ -130,6 +130,9 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
             R.id.ll_my_record -> {
                 readyGo(WatchRecordActivity::class.java)
             }
+            R.id.ll_my_order -> {
+                readyGo(OrderRecordActivity::class.java)
+            }
             R.id.ll_my_feed -> {
                 readyGo(FeedbackActivity::class.java)
             }
@@ -211,6 +214,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         ll_my_feed.setOnClickListener(this)
         ll_my_payrecord.setOnClickListener(this)
         ll_my_setting.setOnClickListener(this)
+        ll_my_order.setOnClickListener(this)
         ll_contactus.setOnClickListener(this)
         btn_action.setOnClickListener(this)
         rl_lucky.setOnClickListener(this)

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

@@ -117,8 +117,8 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
                         android:layout_marginTop="102dp"
-                        android:gravity="right"
                         android:layout_marginEnd="20dp"
+                        android:gravity="right"
                         android:text="解锁全部短剧"
                         android:textColor="#5B1500"
                         android:textSize="14sp"
@@ -176,6 +176,38 @@
                     android:layout_marginBottom="10dp"
                     android:orientation="vertical">
 
+                    <LinearLayout
+                        android:id="@+id/ll_my_order"
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingStart="20dp"
+                        android:paddingEnd="15dp">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="我的订单"
+                            android:textColor="@color/color_DEBBFE"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:padding="6dp"
+                            android:src="@mipmap/ic_arrow_more_my" />
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginEnd="20dp"
+                        android:background="@color/color_403764" />
+
                     <LinearLayout
                         android:id="@+id/ll_my_payrecord"
                         android:layout_width="match_parent"