Merge remote-tracking branch 'origin/master'

app/src/main/java/com/zhangxin/starlight/activity/MainActivity.java

@@ -76,6 +76,7 @@ import java.util.List;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Consumer;
+import me.jessyan.autosize.internal.CancelAdapt;
 
 /**
  * Copyright @ 2018 Bitgoose All rights reserved.
@@ -85,7 +86,7 @@ import io.reactivex.functions.Consumer;
  * @author: fuxin
  * @date: 2019/3/15 下午2:19
  */
-public class MainActivity extends BaseActivity implements NavigationBottomView.NavifationCallback/*, IDialogCloseCallback, MemberContract.View*/ {
+public class MainActivity extends BaseActivity implements NavigationBottomView.NavifationCallback/*, IDialogCloseCallback, MemberContract.View*/, CancelAdapt {
 
     private List<Fragment> fragments = new ArrayList<>();
     private NavigationBottomView navigationView;

cms/src/main/java/com/zxhl/cms/net/model/chat/FollowEntity.kt

@@ -14,4 +14,6 @@ class FollowEntity {
     var hasLikes: String = ""
     var chatStatus: Int? = 0
     var dateStr: String = ""
+    var nationalFlag: String = ""
+    var videoPrice: String = ""
 }
\ No newline at end of file

cms/src/main/java/com/zxhl/cms/utils/Utils.java

@@ -36,6 +36,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
+import androidx.core.location.GnssStatusCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.gson.Gson;
@@ -77,6 +78,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
@@ -1192,6 +1194,36 @@ public class Utils {
             return true;
         return false;
     }
-
+    public static String getXingZuo(String date){
+        int birthdayParty = Integer.parseInt(date.substring(5,10).replace("-", ""));
+        int constellationType = 0;
+        for (int i = 0; i < ConstellationList.length; i++) {
+            if (birthdayParty < ConstellationList[i]) {
+                constellationType = i == 0 ? 12 : i;
+                break;
+            }
+        }
+        return ConstellationType.get(constellationType);
+    }
+    private static final int[] ConstellationList = {
+            120,219,321,420,521,622,723,823,923,1024,1123,1222,1300
+    };
+
+    private static final Map<Integer, String> ConstellationType = new HashMap<>();
+    static {
+        ConstellationType.put(0, "摩羯座");
+        ConstellationType.put(1, "水瓶座");
+        ConstellationType.put(2, "双鱼座");
+        ConstellationType.put(3, "白羊座");
+        ConstellationType.put(4, "金牛座");
+        ConstellationType.put(5, "双子座");
+        ConstellationType.put(6, "巨蟹座");
+        ConstellationType.put(7, "狮子座");
+        ConstellationType.put(8, "处女座");
+        ConstellationType.put(9, "天秤座");
+        ConstellationType.put(10, "天蝎座");
+        ConstellationType.put(11, "射手座");
+        ConstellationType.put(12, "摩羯座");
+    }
 }
 

cms/src/main/java/com/zxhl/cms/widget/CountNumberView.java

+package com.zxhl.cms.widget;
+
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.animation.AccelerateDecelerateInterpolator;
+
+
+public class CountNumberView extends androidx.appcompat.widget.AppCompatTextView {
+    //动画时长
+    private int duration = 1500;
+    //显示数字
+    private float number;
+    //显示表达式
+    private String regex;
+
+    //显示表示式
+    public static final String INTREGEX = "%1$01.0f";//不保留小数，整数
+    public static final String FLOATREGEX = "%1$01.2f";//保留2位小数
+
+    public CountNumberView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * 显示带有动画效果的数字
+     * @param number
+     * @param regex
+     */
+    public void showNumberWithAnimation(float number, String regex) {
+        if (TextUtils.isEmpty(regex)) {
+            //默认为整数
+            this.regex = INTREGEX;
+        } else {
+            this.regex = regex;
+        }
+        //修改number属性，会调用setNumber方法
+        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(this, "number", 0, number);
+        objectAnimator.setDuration(duration);
+        //加速器，从慢到快到再到慢
+        objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
+        objectAnimator.start();
+    }
+
+    /**
+     * 获取当前数字
+     * @return
+     */
+    public float getNumber() {
+        return number;
+    }
+
+    /**
+     * 根据正则表达式，显示对应数字样式
+     * @param number
+     */
+    public void setNumber(float number) {
+        this.number = number;
+        setText(String.format(regex, number));
+    }
+}
\ No newline at end of file

cms/src/main/res/layout/item_layout_photo.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="140dp">
+    android:layout_height="140dp"
+    android:id="@+id/id_rl_item">
 
     <ImageView
         android:id="@+id/id_img_show"
@@ -12,9 +13,10 @@
 
     <ImageView
         android:id="@+id/id_img_add"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+
         android:background="@drawable/icon_add_photo" />
 
     <ImageView

moduleMain/build.gradle

@@ -52,7 +52,6 @@ dependencies {
     implementation project(':Source')
     implementation 'com.airbnb.android:lottie:3.1.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
     implementation 'com.contrarywind:Android-PickerView:4.1.9'
     implementation 'com.zhy:percent-support-extends:1.0.1'
     implementation 'com.cncoderx.wheelview:library:1.2.5'

moduleMain/src/main/java/com/zxhl/main/page/activity/ConstellReslutActivity.kt

 package com.zxhl.main.page.activity
 
+
+import android.Manifest
+import android.app.Activity
+import android.graphics.ImageFormat
+import android.hardware.Camera
+import android.media.MediaPlayer
+import android.os.Build
+import android.os.Handler
 import android.text.TextUtils
+import android.util.Log
+import android.view.SurfaceHolder
 import android.view.View
+import android.view.animation.AnimationUtils
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.bumptech.glide.request.RequestOptions
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.net.SettingPreference
-import com.zxhl.cms.net.model.chat.ConstellationEntity
 import com.zxhl.cms.net.model.chat.StarMachEntity
+import com.zxhl.cms.runtimepermission.NicePermission
+import com.zxhl.cms.runtimepermission.NicePermissionListener
+import com.zxhl.cms.utils.NoDoubleClickListener
+import com.zxhl.cms.widget.ChatDialogUtils
 import com.zxhl.main.R
 import com.zxhl.main.page.contract.StarMachContract
 import com.zxhl.main.page.presenter.StarMachPresenter
 import kotlinx.android.synthetic.main.activity_layout_constell_reslut.*
+import java.io.IOException
 
-class ConstellReslutActivity : BaseActivity(), StarMachContract.View {
+class ConstellReslutActivity : BaseActivity(), StarMachContract.View, Camera.PreviewCallback {
     private var mPresenter: StarMachPresenter? = null
-    override fun init() {
-        mPresenter = StarMachPresenter(this)
-        mPresenter?.getStarMachReslut()
-        id_img_close?.setOnClickListener {
-            finish()
-        }
-    }
+    private var mediaPlayer: MediaPlayer? = null
+    var Camerafb = 1
+    private var mHandler: Handler? = null
+    private var count: Int = 0
+    private var ifCharge:Boolean=false
+    /**
+     * 创建Camera对象
+     * 用来获取摄像头
+     */
+    var camera: Camera? = null
+
 
     override fun before() {
         super.before()
@@ -38,19 +57,71 @@ class ConstellReslutActivity : BaseActivity(), StarMachContract.View {
         return R.layout.activity_layout_constell_reslut
     }
 
+    override fun init() {
+        mediaPlayer = MediaPlayer()
+        mHandler=Handler()
+        mPresenter = StarMachPresenter(this)
+        mPresenter?.getStarMachReslut()
+        checkPermission()
+        id_img_close?.setOnClickListener {
+            finish()
+        }
+        id_tv_next_girl?.setOnClickListener(object : NoDoubleClickListener() {
+            override fun onNoDoubleClick(v: View?) {
+                mPresenter?.getStarMachReslut()
+            }
+
+        })
+        id_img_xintiao.animation = AnimationUtils.loadAnimation(context, R.anim.button_scale_anim)
+
+    }
+
+    //检查用的权限
+    fun checkPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//            //获取权限（如果没有开启权限，会弹出对话框，询问是否开启权限）
+            NicePermission(this, object : NicePermissionListener {
+                override fun onGranted() {
+                    id_surface_camer_view?.postDelayed({
+                        initcamera()
+                    }, 1000)
+
+                }
+
+                override fun onRefused() {
+                    ChatDialogUtils.showPermissionDialog(mActivity as Activity, "请开启相机和录音权限")
+                }
+            }).requestPermission(
+                *arrayOf(
+                    Manifest.permission.CAMERA,
+                    Manifest.permission.RECORD_AUDIO
+                )
+            )
+        }
+
+
+    }
+
     override fun setReslut(result: StarMachEntity?) {
         if (result != null) {
+            Camerafb = 1
             id_tv_user_nick_name?.text = result.nickname
             id_tv_matchingdegree?.text = "${result.matchingDegree}"
             setStar(result.matchingDegree)
-            id_tv_age?.text="${result.age}"
-            id_tv_price?.text="${result.videoPrice}/min"
+            id_tv_age?.text = "${result.age}"
+            id_tv_price?.text = "${result.videoPrice}/min"
+            if (!TextUtils.isEmpty(result.video)) {
+                ifCharge=true
+                playVideo(result.video)
+            }else{
+                ifCharge=false
+            }
             if (TextUtils.equals(result.sex, "2")) {
                 id_ll_sex_bg.setBackgroundResource(R.drawable.shape_girl_bg)
             } else {
                 id_ll_sex_bg.setBackgroundResource(R.drawable.shape_boy_bg)
             }
-            id_img_guoqi?.setLoadImageUrl(result.nationalFlag,false)
+            id_img_guoqi?.setLoadImageUrl(result.nationalFlag, false)
             if (!TextUtils.isEmpty(result.headImage)) {
                 Glide.with(AppContext.get()).load(result.headImage)
                     .apply(RequestOptions.bitmapTransform(CircleCrop()))
@@ -112,4 +183,144 @@ class ConstellReslutActivity : BaseActivity(), StarMachContract.View {
             }
         }
     }
+
+    fun playVideo(url: String?) {
+        id_view_constell_reslut?.visibility = View.VISIBLE
+        id_ll_conneting?.visibility = View.GONE
+
+        try {
+            if (mediaPlayer == null) {
+                mediaPlayer = MediaPlayer()
+            }
+            //给MediaPlayer设置播放源
+            mediaPlayer?.reset()
+            mediaPlayer?.setDataSource(url)
+            mediaPlayer?.prepareAsync()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+        id_view_constell_reslut?.holder?.addCallback(object : SurfaceHolder.Callback {
+            override fun surfaceCreated(holder: SurfaceHolder?) {
+                mediaPlayer?.setDisplay(id_view_constell_reslut?.holder)
+            }
+
+            override fun surfaceChanged(
+                holder: SurfaceHolder?,
+                format: Int,
+                width: Int,
+                height: Int
+            ) {
+                Log.e("MXL", "surfaceChanged")
+            }
+
+            override fun surfaceDestroyed(holder: SurfaceHolder?) {
+                Log.e("MXL", "surfaceDestroyed")
+            }
+        })
+        mediaPlayer?.setOnCompletionListener {
+            Log.e("MXL", "onComplet")
+            id_tv_chornometer.stop()
+            stopVieo()
+            setVideoView()
+            mPresenter?.getStarMachReslut()
+        }
+        mediaPlayer?.setOnPreparedListener {
+            Log.e("MXL", "setOnPrep")// 开始播放
+            mediaPlayer?.start()
+            id_tv_chornometer.start()
+
+
+        }
+    }
+
+    fun setVideoView() {
+        id_view_constell_reslut?.visibility = View.GONE
+        id_ll_conneting?.visibility = View.VISIBLE
+    }
+
+    fun stopVieo() {
+        if (mediaPlayer != null) {
+            if (mediaPlayer!!.isPlaying) {
+                mediaPlayer!!.stop()
+            }
+        }
+    }
+    private val runnable: Runnable = object : Runnable {
+        override fun run() {
+            if(ifCharge==true){
+                mHandler?.postDelayed(this, 60000)
+                Log.e("MXL","每隔一分钟去执行扣费")
+
+            }
+
+        }
+    }
+
+    /**
+     * 初始化摄像头
+     */
+    fun initcamera() {
+        try {
+            //如果camera中有值的，则清空camera中的数据
+            if (camera != null) {
+                camera?.stopPreview()
+                camera?.release()
+                camera = null
+            }
+            camera = Camera.open(Camerafb) //开启摄像头,open中需要赋值,0为后置摄像头，1为前置摄像头
+            val parameters: Camera.Parameters? = camera?.getParameters() //从摄像头返回的数据
+            parameters?.setPreviewFormat(ImageFormat.NV21) //设置摄像头的预览帧格式
+            camera?.setDisplayOrientation(90) //调整相机拍到的图像旋转，不然竖着拿手机,图像是横着的
+            parameters?.setRotation(90) //调整的图像旋转,不然竖着拿手机,图像是横着的
+            //获取尺寸的大小
+            val sizeList: List<Camera.Size>? = parameters?.getSupportedPictureSizes()
+            if (sizeList?.size!! > 1) {
+                val itor: Iterator<Camera.Size> = sizeList.iterator()
+                while (itor.hasNext()) {
+                    val cur: Camera.Size = itor.next()
+                    Log.i("jw", "val$cur")
+                }
+            }
+            //设置图像预览的尺寸
+            parameters.setPreviewSize(640, 480)
+            parameters.setPictureSize(640, 480)
+            camera?.setParameters(parameters) //设置摄像头需要的数据
+            camera?.setPreviewDisplay(id_surface_camer_view!!.holder) //使用getHolder方法把数据返回给surfaceview
+            camera?.setPreviewCallback(this) //摄像头的回调
+            camera?.startPreview() //开始预览取景
+            mHandler?.post(runnable)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    //释放摄像头资源
+    fun destroyCamera() {
+        if (camera == null) {
+            return
+        }
+        camera!!.setPreviewCallback(null)
+        camera!!.stopPreview()
+        camera!!.release()
+        camera = null
+    }
+
+    override fun onStop() {
+        super.onStop()
+        destroyCamera()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (mediaPlayer != null) {
+            mediaPlayer?.stop()
+            mediaPlayer?.reset()
+            mediaPlayer?.release()
+        }
+
+    }
+
+    override fun onPreviewFrame(data: ByteArray?, camera: Camera?) {
+
+    }
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/activity/UserInfoActivity.kt

@@ -668,6 +668,7 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
                 delet(position)
             }
             R.id.id_img_show -> {
+                Log.e("MXL","mImgUrlList:"+mImgList.size)
                 iwHelper?.show(
                     getImageUriList(mImgUrlList), position
                 )
@@ -788,5 +789,11 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
             mPresenter?.updateUserHeadImg(headImg)
         }
     }
+    override fun onBackPressed() {
+        if (!iwHelper!!.handleBackPressed()) {
+            super.onBackPressed()
+        }
+    }
+
 
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/LikesAdpater.kt

@@ -18,6 +18,7 @@ import com.zxhl.cms.net.model.chat.FollowEntity
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 import com.zxhl.cms.widget.BlurTransformation
 import com.zxhl.cms.widget.CircleImageView
+import com.zxhl.cms.widget.RecycleImageView
 import com.zxhl.main.R
 
 class LikesAdpater : BaseRecyclerAdapter<FollowEntity, LikesAdpater.ViewHolder> {
@@ -40,19 +41,14 @@ class LikesAdpater : BaseRecyclerAdapter<FollowEntity, LikesAdpater.ViewHolder>
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val data = mList[position]
         holder.id_tv_name.text = data.nickname
-//
-//        holder.id_tv_like_time.text=data.dateStr + "  喜欢了你"
-//        if(data.chatStatus==0){
-//            holder.id_tv_chat.text = "打招呼"
-//            holder.id_tv_chat.setTextColor(AppContext.get().resources.getColor(R.color.white))
-//            holder.id_tv_chat.setBackgroundResource(R.drawable.shape_aa60ff_r3)
-//        }else{
-//            holder.id_tv_chat.text = "继续聊天"
-//            holder.id_tv_chat.setBackgroundResource(R.drawable.shape_aa60ff_storke_r5)
-//            holder.id_tv_chat.setTextColor(AppContext.get().resources.getColor(R.color.color_aa60ff))
-//        }
-//
-
+        holder.id_tv_price.text="${data.videoPrice}/min"
+        holder.id_img_guoqi.setLoadImageUrl("${data.nationalFlag}",false)
+        if (!TextUtils.isEmpty(data.headImage)) {
+            Glide.with(AppContext.get()).load(data.headImage)
+                .into(holder.id_img_likes_head)
+        } else {
+            holder.id_img_likes_head.setImageResource(R.drawable.icon_user_photo_default)
+        }
     }
 
     inner class ViewHolder : RecyclerView.ViewHolder {
@@ -60,7 +56,7 @@ class LikesAdpater : BaseRecyclerAdapter<FollowEntity, LikesAdpater.ViewHolder>
 
         var id_tv_name: TextView
         var id_tv_price: TextView
-        var id_img_guoqi: ImageView
+        var id_img_guoqi: RecycleImageView
         var id_img_xiaoxi: ImageView
         var id_img_shipin: ImageView
         var id_img_likes_head: CircleImageView

moduleMain/src/main/java/com/zxhl/main/page/adapter/PublishPhotoAdapter.kt

@@ -37,7 +37,7 @@ class PublishPhotoAdapter : BaseRecyclerAdapter<String, PublishPhotoAdapter.View
 
     override fun getItemCount(): Int {
         val size = mList.size
-        if (size < 8) {
+        if (size < 6) {
             return size + 1
         } else {
             return size
@@ -64,16 +64,16 @@ class PublishPhotoAdapter : BaseRecyclerAdapter<String, PublishPhotoAdapter.View
         if (position < list.size) {
             var str = mList[position]
             Glide.with(AppContext.mAppContext).load(str)
-                .into(holder?.item_img_show!!)
-                holder?.item_img_del?.visibility = View.VISIBLE
+                .into(holder.item_img_show!!)
+                holder.item_img_del?.visibility = View.VISIBLE
             // holder?.item_img_show?.setLoadImageUrl(str, false)
            // holder?.item_img_show?.setLoadImageUrl(Uri.parse(bean.compressPath))
 
-            holder?.item_img_add?.visibility = View.GONE
+            holder.item_img_add?.visibility = View.GONE
         } else {
-            holder?.item_img_show?.setImageResource(R.color.color_ededed)
-            holder?.item_img_del?.visibility = View.GONE
-            holder?.item_img_add?.visibility = View.VISIBLE
+            holder.item_img_show?.setImageResource(R.color.color_ededed)
+            holder.item_img_del?.visibility = View.GONE
+            holder.item_img_add?.visibility = View.VISIBLE
         }
 
 

moduleMain/src/main/java/com/zxhl/main/page/fragment/ConstellationMachFragment.kt

 package com.zxhl.main.page.fragment
 
+import android.os.Handler
 import android.text.TextUtils
+import android.util.Log
 import android.view.View
+import android.view.animation.Animation
+import android.view.animation.Animation.AnimationListener
+import android.view.animation.AnimationUtils
+import android.view.animation.LinearInterpolator
+import android.view.animation.RotateAnimation
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
@@ -10,20 +17,62 @@ import com.zxhl.cms.common.base.BaseFragment
 import com.zxhl.cms.net.model.chat.ConstellationEntity
 import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.NoDoubleClickListener
+import com.zxhl.cms.utils.Utils
+import com.zxhl.cms.widget.CountNumberView
 import com.zxhl.main.R
+import com.zxhl.main.page.`interface`.ChooseDateCallBack
 import com.zxhl.main.page.contract.ConstellationContract
 import com.zxhl.main.page.presenter.ConstellationPresenter
+import com.zxhl.main.page.view.DialogUtils
 import kotlinx.android.synthetic.main.fragment_layout_constellation_match.*
+import me.jessyan.autosize.internal.CancelAdapt
+import java.util.*
+import kotlin.collections.ArrayList
 
-class ConstellationMachFragment : BaseFragment(), ConstellationContract.View {
+
+class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, ChooseDateCallBack,
+    CancelAdapt {
     private var mPresenter: ConstellationPresenter? = null
     private var mListImgView: MutableList<ImageView> = ArrayList()
+    private var chosseDate: String? = "2022-04-19"
+    private var rotate: RotateAnimation? = null
     override fun layoutID(): Int {
         return R.layout.fragment_layout_constellation_match
     }
 
     override fun init(view: View?) {
+        handler.post(myRunnable)
         mPresenter = ConstellationPresenter(this)
+        rotate = RotateAnimation(
+            0f,
+            359f,
+            Animation.RELATIVE_TO_PARENT,
+            0.5f,
+            Animation.RELATIVE_TO_PARENT,
+            0.5f
+        )
+//        rotate!!.interpolator = LinearInterpolator()
+////        rotate.setInterpolator(lin);
+//        rotate!!.duration = 1200//设置动画持续周期
+//        rotate!!.repeatCount = 2//设置重复次数
+//        rotate!!.setStartOffset(10);//执行前的等待时间
+//        rotate!!.setAnimationListener(object : AnimationListener {
+//            override fun onAnimationStart(animation: Animation?) {
+//                //动画开始
+//                Log.e("MXL", "onAnimationStart")
+//            }
+//
+//            override fun onAnimationEnd(animation: Animation?) {
+//                JumpUtils.ConstellResultJump()
+//                Log.e("MXL", "onAnimationEnd")
+//            }
+//
+//            override fun onAnimationRepeat(animation: Animation?) {
+//                Log.e("MXL", "onAnimationRepeat")
+//            }
+
+ //       })
+
         mListImgView.add(id_img_shuiping)
         mListImgView.add(id_img_shuangyu)
         mListImgView.add(id_img_mojie)
@@ -36,30 +85,39 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View {
         mListImgView.add(id_img_tianxie)
         mListImgView.add(id_img_sheshou)
         mListImgView.add(id_img_baiyang)
-        id_tv_start_mach?.setOnClickListener(object :NoDoubleClickListener(){
+        id_tv_start_mach?.setOnClickListener(object : NoDoubleClickListener() {
             override fun onNoDoubleClick(v: View?) {
-                JumpUtils.ConstellResultJump()
+                id_rl_xingzuo.startAnimation(AnimationUtils.loadAnimation(mActivity, R.anim.rotate_anim))
+               // id_rl_xingzuo.startAnimation(rotate)
+                id_rl_xingzuo?.postDelayed({
+                    JumpUtils.ConstellResultJump()
+                }, 3000)
+
             }
 
         })
+        id_img_choose?.setOnClickListener {
+            DialogUtils.showchooseConsellation(mActivity, this)
+        }
+
     }
 
     override fun lazyLoad() {
         super.lazyLoad()
         if (isInitial && isVisible) {
-            mPresenter?.getConstellationPairing("0727")
+            mPresenter?.getConstellationPairing(chosseDate.toString())
         }
     }
 
     override fun setReslut(result: ConstellationEntity?) {
         if (!result?.list.isNullOrEmpty()) {
-            for (i in 0 until (result?.list!!.size )) {
+            for (i in 0 until (result?.list!!.size)) {
 //                if(!TextUtils.isEmpty(result.list!![i].headImage)){
 //                    mListImgView[i].visibility=View.VISIBLE
 //                }else{
 //                    mListImgView[i].visibility=View.GONE
 //                }
-                if (i < mListImgView.size) {
+                if (i < result.list!!.size) {
                     Glide.with(this).load(result.list!![i].headImage)
                         .apply(RequestOptions.bitmapTransform(CircleCrop()))
                         .into(mListImgView[i])
@@ -68,4 +126,69 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View {
             }
         }
     }
+
+    private val handler = Handler()
+
+    private val myRunnable: Runnable = object : Runnable {
+        override fun run() {
+            Log.e("MXL", "执行")
+            handler.postDelayed(this, 10000)
+            id_tv_mach_peoples.showNumberWithAnimation(getNum(), CountNumberView.INTREGEX)
+        }
+    }
+
+    fun getNum(): Float {
+        val random = Random()
+        var number = random.nextInt(102) + 402
+        Log.e("MXL", "Number:" + number)
+        return number.toFloat()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (handler != null) {
+            handler.removeCallbacks(myRunnable)
+        }
+    }
+
+    override fun chooseData(date: String?) {
+        Log.e("MXL", "星座选择的日期：" + date)
+        chosseDate = date
+        if (!TextUtils.isEmpty(chosseDate)) {
+            mPresenter?.getConstellationPairing(chosseDate.toString())
+            setConsellIcon(id_img_choose, Utils.getXingZuo(chosseDate))
+            Log.e("MXL", "星座" + Utils.getXingZuo(chosseDate))
+        }
+
+    }
+
+    fun setConsellIcon(img: ImageView, str: String) {
+        if (TextUtils.equals(str, "摩羯座")) {
+            img.setImageResource(R.drawable.button_mojie)
+        } else if (TextUtils.equals(str, "水瓶座")) {
+            img.setImageResource(R.drawable.button_shuiping)
+        } else if (TextUtils.equals(str, "双鱼座")) {
+            img.setImageResource(R.drawable.button_shuangyu)
+        } else if (TextUtils.equals(str, "白羊座")) {
+            img.setImageResource(R.drawable.button_baiyang)
+        } else if (TextUtils.equals(str, "金牛座")) {
+            img.setImageResource(R.drawable.button_jinniu)
+        } else if (TextUtils.equals(str, "双子座")) {
+            img.setImageResource(R.drawable.button_shuangzi)
+        } else if (TextUtils.equals(str, "巨蟹座")) {
+            img.setImageResource(R.drawable.button_juxie)
+        } else if (TextUtils.equals(str, "狮子座")) {
+            img.setImageResource(R.drawable.button_shizi)
+        } else if (TextUtils.equals(str, "处女座")) {
+            img.setImageResource(R.drawable.button_chunv)
+        } else if (TextUtils.equals(str, "天秤座")) {
+            img.setImageResource(R.drawable.button_tiancheng)
+        } else if (TextUtils.equals(str, "天蝎座")) {
+            img.setImageResource(R.drawable.button_tianxie)
+        } else if (TextUtils.equals(str, "射手座")) {
+            img.setImageResource(R.drawable.button_sheshou)
+        }
+    }
+
+
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/fragment/LikeFragment.kt

@@ -88,7 +88,7 @@ class LikeFragment : BaseFragment(), MyLikesContract.View,
     override fun setEmptyView() {
         id_refresh_layout?.isRefreshing = false
         id_ll_empty?.visibility = View.VISIBLE
-        id_tv_empty_text.text = "暂时没有人喜欢你，快去找用户喜欢你吧～"
+        id_tv_empty_text.text = "No Content"
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(chatStausEvent: ChatStausEvent){
@@ -98,7 +98,7 @@ class LikeFragment : BaseFragment(), MyLikesContract.View,
     }
     override fun onDestroy() {
         super.onDestroy()
-        EventBus.getDefault().unregister(this)
+      //  EventBus.getDefault().unregister(this)
     }
     companion object {
 

moduleMain/src/main/java/com/zxhl/main/page/view/DialogUtils.kt

@@ -446,5 +446,52 @@ object DialogUtils {
         mDialog.setCancelable(true)
         mDialog?.show()
     }
+    fun showchooseConsellation(
+        context: Activity,
+        chooseDatalistener: ChooseDateCallBack
+    ) {
+        if (context == null) return
+        val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
+        val mDialogView =
+            showBottomDialog(
+                R.layout.dialog_layout_choose_constellation,
+                context,
+                mDialog,
+                0,
+                Gravity.CENTER
+            )
+        var chooseDate: String? = ""
 
+        val datePicker = mDialogView.findViewById<DateTimePicker>(R.id.dateTimePicker)
+        val _MAX_TIME = (365*24* 60 * 60 * 13 * 1000L)+(366*24* 60 * 60 * 5 * 1000L)
+        val curTime = System.currentTimeMillis()
+        val maxTime: Long = curTime
+        datePicker?. setDefaultMillisecond(curTime)
+        datePicker?.setMaxMillisecond(maxTime)
+        val tvsure = mDialogView.findViewById<TextView>(R.id.id_tv_confirm)
+        val tvquxiao = mDialogView.findViewById<TextView>(R.id.id_tv_cancel)
+        //  datePicker?.setMaxMillisecond()
+        datePicker.setOnDateTimeChangedListener(object : DateTimePicker.OnDateTimeChangedListener {
+            override fun onDateTimeChanged(view: DateTimePicker?, millisecond: Long) {
+                chooseDate = StringUtils.conversionTime(millisecond, "yyyy-MM-dd")
+            }
+        })
+        tvsure?.setOnClickListener {
+
+            chooseDatalistener?.chooseData(chooseDate)
+            mDialog.dismiss()
+        }
+        tvquxiao?.setOnClickListener {
+            chooseDate = ""
+            chooseDatalistener?.chooseData(chooseDate)
+            mDialog.dismiss()
+        }
+
+        val array = intArrayOf(0, 1, 2)
+        datePicker?.setDisplayType(array)
+        datePicker?.showLabel(false)
+        mDialog.setCanceledOnTouchOutside(true)
+        mDialog.setCancelable(true)
+        mDialog?.show()
+    }
 }
\ No newline at end of file

moduleMain/src/main/res/anim/button_scale_anim.xml

+<?xml version="1.0" encoding="utf-8"?>
+<scale xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="MissingDefaultResource"
+    android:duration="330"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:fromXScale="1.0"
+    android:fromYScale="1.0"
+    android:toXScale="1.1"
+    android:toYScale="1.1"
+    android:repeatMode="reverse"
+    android:repeatCount="infinite"/>
\ No newline at end of file

moduleMain/src/main/res/anim/rotate_anim.xml

+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="0"
+    android:toDegrees="359"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:duration="1200"
+    android:interpolator="@android:anim/linear_interpolator"
+    android:repeatCount="2"/>

moduleMain/src/main/res/drawable/shape_ffffff_r20_s_999999.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <stroke
+        android:width="1dp"
+        android:color="#ff999999" />
+    <solid android:color="#ffffffff" />
+    <corners android:radius="20dp" />
+
+</shape>
\ No newline at end of file

moduleMain/src/main/res/layout/activity_layout_constell_reslut.xml

@@ -11,13 +11,18 @@
         app:layout_heightPercent="50%"
         app:layout_widthPercent="50%">
 
+        <SurfaceView
+            android:id="@+id/id_view_constell_reslut"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/id_tv_user_nick_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="34dp"
-            android:text="Marry"
             android:textColor="@color/white"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -25,10 +30,10 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
             android:layout_below="@+id/id_tv_user_nick_name"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="5dp">
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical">
 
             <com.zxhl.cms.widget.RecycleImageView
                 android:id="@+id/id_img_guoqi"
@@ -79,13 +84,13 @@
                     android:id="@+id/id_tv_price"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="60/min"
                     android:textColor="#FFCB3A"
                     android:textSize="11sp" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/id_ll_conneting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
@@ -113,6 +118,7 @@
                 android:textSize="15sp" />
 
         </LinearLayout>
+
     </RelativeLayout>
 
     <RelativeLayout
@@ -123,6 +129,11 @@
         app:layout_heightPercent="50%"
         app:layout_widthPercent="50%">
 
+        <SurfaceView
+            android:id="@+id/id_surface_camer_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
         <ImageView
             android:id="@+id/id_img_close"
             android:layout_width="wrap_content"
@@ -131,6 +142,7 @@
             android:layout_marginTop="30dp"
             android:padding="10dp"
             android:src="@drawable/icon_xingzuo_guanbi" />
+
     </RelativeLayout>
 
     <RelativeLayout
@@ -150,18 +162,42 @@
             <ImageView
                 android:id="@+id/id_img_user_head"
                 android:layout_width="60dp"
-                android:layout_height="60dp" />
+                android:layout_height="60dp"
+                android:layout_marginRight="10dp" />
 
             <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp">
+                android:layout_width="120dp"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toLeftOf="@+id/id_img_yuan"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/icon_dian_little" />
+
+                <ImageView
+                    android:id="@+id/id_img_yuan"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/yuan" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toRightOf="@+id/id_img_yuan"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/icon_dian_little" />
 
                 <TextView
                     android:id="@+id/id_tv_matchingdegree"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
                     android:text="0"
                     android:textColor="#FFCB3A"
                     android:textSize="24sp"
@@ -171,7 +207,8 @@
             <ImageView
                 android:id="@+id/id_img_my_head"
                 android:layout_width="60dp"
-                android:layout_height="60dp" />
+                android:layout_height="60dp"
+                android:layout_marginLeft="10dp" />
 
 
         </LinearLayout>
@@ -181,6 +218,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/id_ll_mach_info"
             android:layout_centerHorizontal="true"
+            android:layout_marginTop="5dp"
             android:background="@drawable/shape_50000000_r10"
             android:paddingLeft="10dp"
             android:paddingTop="6dp"
@@ -191,39 +229,39 @@
                 android:id="@+id/id_img_one_star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_xing_default"
-                android:layout_marginRight="7dp"/>
+                android:layout_marginRight="7dp"
+                android:src="@drawable/icon_xing_default" />
 
             <ImageView
                 android:id="@+id/id_img_two_star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_xing_default"
-                android:layout_marginRight="7dp"/>
+                android:layout_marginRight="7dp"
+                android:src="@drawable/icon_xing_default" />
 
             <ImageView
                 android:id="@+id/id_img_three_star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_xing_default"
-                android:layout_marginRight="7dp"/>
+                android:layout_marginRight="7dp"
+                android:src="@drawable/icon_xing_default" />
 
             <ImageView
                 android:id="@+id/id_img_four_star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_xing_default"
-                android:layout_marginRight="7dp"/>
+                android:layout_marginRight="7dp"
+                android:src="@drawable/icon_xing_default" />
 
             <ImageView
                 android:id="@+id/id_img_five_star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_xing_default"
-                />
+                android:src="@drawable/icon_xing_default" />
         </LinearLayout>
 
         <TextView
+            android:id="@+id/id_tv_next_girl"
             android:layout_width="250dp"
             android:layout_height="45dp"
             android:layout_alignParentBottom="true"
@@ -238,6 +276,7 @@
     </RelativeLayout>
 
     <ImageView
+        android:id="@+id/id_img_xindiantu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -245,6 +284,7 @@
         android:src="@drawable/quxian" />
 
     <ImageView
+        android:id="@+id/id_img_xintiao"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -269,11 +309,19 @@
             android:src="@drawable/icon_shijian" />
 
         <TextView
+            android:id="@+id/id_tv_count_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="00:00"
+            android:textColor="#FFCB3A"
+            android:textSize="11sp"
+            android:visibility="gone"/>
+        <Chronometer
+            android:id="@+id/id_tv_chornometer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="00:30"
             android:textColor="#FFCB3A"
-            android:textSize="11sp" />
+            android:textSize="11sp"/>
     </LinearLayout>
 
 

moduleMain/src/main/res/layout/dialog_layout_choose_constellation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_ffffff_r10"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:paddingLeft="15dp"
+        android:paddingTop="20dp"
+        android:paddingRight="15dp"
+        android:paddingBottom="20dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="The right constellation helps to"
+            android:textColor="@color/color_666666"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="match you with a more suitable girl"
+            android:textColor="@color/color_666666"
+            android:textSize="14sp" />
+
+        <com.loper7.date_time_picker.DateTimePicker
+            android:id="@+id/dateTimePicker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showLabel="false"
+            app:textSize="18sp"
+            app:themeColor="@color/color_333333"
+            />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
+        <TextView
+            android:id="@+id/id_tv_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_ffffff_r20_s_999999"
+            android:text="Cancel"
+            android:gravity="center"
+            android:textSize="15sp"
+            android:layout_marginRight="15dp"
+            android:textColor="@color/color_333333"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:paddingLeft="25dp"
+            android:paddingRight="25dp"/>
+            <TextView
+                android:id="@+id/id_tv_confirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/shape_ffffff_r20_s_999999"
+                android:text="Confirm"
+                android:gravity="center"
+                android:textSize="15sp"
+                android:textColor="@color/color_333333"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

moduleMain/src/main/res/layout/dialog_layout_date.xml

@@ -54,7 +54,7 @@
         android:id="@+id/dateTimePicker"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:showLabel="true"
+        app:showLabel="false"
         app:textSize="16sp"
         app:themeColor="@color/color_333333" />
 </LinearLayout>

moduleMain/src/main/res/layout/item_layout_likes.xml

@@ -34,7 +34,7 @@
         android:layout_toRightOf="@+id/id_img_likes_head"
         android:gravity="center_vertical">
 
-        <ImageView
+        <com.zxhl.cms.widget.RecycleImageView
             android:id="@+id/id_img_guoqi"
             android:layout_width="20dp"
             android:layout_height="14dp"
@@ -46,7 +46,6 @@
             android:layout_height="wrap_content"
             android:drawableLeft="@drawable/icon_xingbi_wode_2"
             android:drawablePadding="4dp"
-            android:text="60/min"
             android:textColor="#FA6240"
             android:textSize="11sp" />
     </LinearLayout>