Merge remote-tracking branch 'origin/master'

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

@@ -476,6 +476,7 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
                                         }
                                     });
                                     LogUtils.d("IM登录成功");
+                                    Log.e("MXL","IM:Suc");
                                     V2TIMManager.getConversationManager().addConversationListener(new V2TIMConversationListener() {
                                         @Override
                                         public void onTotalUnreadMessageCountChanged(long totalUnreadCount) {
@@ -488,6 +489,7 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
                                 @Override
                                 public void onError(int i, String s) {
                                     LogUtils.d("IM登录失败");
+                                    Log.e("MXL","IM:fail"+i+"str"+s);
                                 }
                             });
                         }
@@ -495,7 +497,7 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
 
                     @Override
                     public void onFailure(Throwable e, String code, String errorMsg) {
-
+                        Log.e("MXL","IM:onFailure");
                     }
                 });
     }

chat/src/main/java/com/ym/chat/fragment/ChatFragment.java

@@ -89,6 +89,15 @@ public class ChatFragment extends BaseFragment implements ChatContract.View, V2T
         return R.layout.fragment_layout_chat;
     }
 
+    private static ChatFragment instance;
+
+    public static ChatFragment getInstance() {
+        if (instance == null) {
+            instance = new ChatFragment();
+        }
+        return instance;
+    }
+
     @Override
     public void init(View view) {
 //        mPresenter = new ChatPresenter(this);

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -253,7 +253,7 @@ public class NetConfig {
         public static final String HOME_STAR_LIGHT_SYNC_POSITION = "app/v1/game/star/syncPosition";//同步最后一次位置信息
         public static final String HOME_STAR_LIGHT_GET_DISTANCE = "app/v1/game/star/getDistance";//获取距离
         //IM
-        public static final String HOME_STAR_LIGHT_GET_ADMIN_KEY = "app/v1/game/star/getAdministratorKey";//获取管理员密钥
+        public static final String HOME_STAR_LIGHT_GET_ADMIN_KEY = "app/v1/hk/game/star/getAdministratorKey";//获取管理员密钥
         public static final String HOME_STAR_LIGHT_VISITOR = "app/v1/game/star/visitor";//消息 - 访客列表
         public static final String HOME_STAR_LIGHT_SEND_MESSAGE = "app/v1/game/star/sendMsg";//发送消息
         public static final String HOME_STAR_LIGHT_MESSAGE_LIST = "app/v1/game/star/messageList";//最近联系人 - 消息列表

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

 package com.zxhl.cms.net.model.chat
 
 class ConstellationEntity {
-    var videoPrice: String? = ""
+    var videoPrice: String = ""
     var list: List<ConstellationList>? = null
 
 }

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

@@ -5,11 +5,14 @@ import android.graphics.Color
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.TextPaint
+import android.text.TextUtils
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
 import android.text.style.ForegroundColorSpan
 import android.util.Log
 import android.view.View
+import com.tencent.imsdk.v2.V2TIMCallback
+import com.ym.chat.utils.TUIUtils
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.Constant
 import com.zxhl.cms.common.NetConfig
@@ -24,15 +27,17 @@ import com.zxhl.cms.router.RounterBus
 import com.zxhl.cms.utils.*
 import com.zxhl.cms.widget.LoadingDialog
 import com.zxhl.main.R
+import com.zxhl.main.page.contract.ImLoginContract
+import com.zxhl.main.page.presenter.ImPresenter
 import kotlinx.android.synthetic.main.activity_layout_login_before.*
 
 
-class LoginBeforeActivity : BaseActivity() {
+class LoginBeforeActivity : BaseActivity(), ImLoginContract.View {
 
     private var googleLogin: GoogleLoginUtil? = null;
     private var faceBookLogin: FaceBookLoginUtil? = null;
     private var mLoading: LoadingDialog? = null
-
+    private var mPresenter: ImPresenter? = null
     override fun init() {
         mLoading = LoadingDialog.getLoadingDialog(
             this,
@@ -41,6 +46,7 @@ class LoginBeforeActivity : BaseActivity() {
             false
         )
         //googleLogin init
+        mPresenter = ImPresenter(this)
         googleLogin = GoogleLoginUtil(this)
         googleLogin?.init()
         //FaceBook
@@ -94,7 +100,7 @@ class LoginBeforeActivity : BaseActivity() {
                         }
                     }
                     EventUtils.onEvent("facebookLoginError", errorMsg)
-//                        Log.e("FaceBookLoginUtil", "error $errorMsg")
+                        Log.e("FaceBookLoginUtil", "error $errorMsg")
                 }
             })
         }
@@ -176,10 +182,11 @@ class LoginBeforeActivity : BaseActivity() {
 
     private fun imLogin() {
         UserDataUtils.updateUserInfo(AdCallback { _, _ ->
-            JumpUtils.activityJump(
-                RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
-            )
-            finish()
+//            JumpUtils.activityJump(
+//                RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
+//            )
+//            finish()
+            mPresenter?.getSign()
         })
 
 //        ApiClient.userInfoAPi.deviceLogin().compose(RxSchedulers.observableIO2Main())
@@ -202,4 +209,34 @@ class LoginBeforeActivity : BaseActivity() {
 //                }
 //            })
     }
+
+
+    override fun getSignSuc(sign: String) {
+        SettingPreference.setImSignInfo(sign)
+        TUIUtils.login(SettingPreference.getUid(), sign, object : V2TIMCallback {
+            override fun onError(code: Int, desc: String) {
+                runOnUiThread {
+                    Log.e("MXL", "链接失败"+code+"desc:"+desc)
+                    JumpUtils.activityJump(
+                        RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
+                    )
+                    //  ToastUtil.toastLongMessage(getString(R.string.failed_login_tip) + ", errCode = " + code + ", errInfo = " + desc)
+                }
+
+            }
+
+            override fun onSuccess() {
+
+                JumpUtils.activityJump(
+                    RounterBus.getRounter(RounterApi::class.java).getIntentActivityMain()
+                )
+
+                finish()
+            }
+        })
+    }
+
+    override fun getSignFail() {
+
+    }
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/contract/ImLoginContract.kt

+package com.zxhl.main.page.contract
+
+class ImLoginContract {
+    interface View {
+        fun getSignSuc(sign:String)
+        fun getSignFail()
+    }
+
+    interface Presenter {
+
+
+        fun getSign()
+    }
+}
\ No newline at end of file

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

@@ -14,6 +14,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.bumptech.glide.request.RequestOptions
 import com.zxhl.cms.common.base.BaseFragment
+import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.chat.ConstellationEntity
 import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.NoDoubleClickListener
@@ -35,6 +36,8 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
     private var mListImgView: MutableList<ImageView> = ArrayList()
     private var chosseDate: String? = "2022-04-19"
     private var rotate: RotateAnimation? = null
+    private var VideoPrice: Double? = 0.0
+    private var clickMach: Boolean = false
     override fun layoutID(): Int {
         return R.layout.fragment_layout_constellation_match
     }
@@ -50,27 +53,6 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
             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)
@@ -86,12 +68,7 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
         mListImgView.add(id_img_baiyang)
         id_tv_start_mach?.setOnClickListener(object : NoDoubleClickListener() {
             override fun onNoDoubleClick(v: View?) {
-                id_rl_xingzuo.startAnimation(AnimationUtils.loadAnimation(mActivity, R.anim.rotate_anim))
-               // id_rl_xingzuo.startAnimation(rotate)
-                id_rl_xingzuo?.postDelayed({
-                    JumpUtils.ConstellResultJump()
-                }, 3000)
-
+                ifBalanceEnough()
             }
 
         })
@@ -101,6 +78,30 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
 
     }
 
+    fun ifBalanceEnough() {
+        val user = SettingPreference.getUserInfoData()
+        Log.e("MXL", "VideoPrice:" + VideoPrice + "usrBalance:" + user.starBalance.toDouble())
+        if (user.starBalance.toDouble().compareTo(VideoPrice!!) > 0) {
+            if (!clickMach) {
+                clickMach = true
+                id_rl_xingzuo.startAnimation(
+                    AnimationUtils.loadAnimation(
+                        mActivity,
+                        R.anim.rotate_anim
+                    )
+                )
+                id_rl_xingzuo?.postDelayed({
+                    JumpUtils.ConstellResultJump()
+                    clickMach = false
+                }, 3000)
+            }
+        } else {
+            Log.e("MXL", "余额不够")
+        }
+
+
+    }
+
     override fun lazyLoad() {
         super.lazyLoad()
         if (isInitial && isVisible) {
@@ -109,13 +110,17 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
     }
 
     override fun setReslut(result: ConstellationEntity?) {
+        if (!TextUtils.isEmpty(result?.videoPrice)) {
+            VideoPrice = result?.videoPrice?.toDoubleOrNull()
+        }
+
         if (!result?.list.isNullOrEmpty()) {
             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(!TextUtils.isEmpty(result.list!![i].headImage)){
+                    mListImgView[i].visibility=View.VISIBLE
+                }else{
+                    mListImgView[i].visibility=View.GONE
+                }
                 if (i < result.list!!.size) {
                     Glide.with(this).load(result.list!![i].headImage)
                         .apply(RequestOptions.bitmapTransform(CircleCrop()))
@@ -130,7 +135,6 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
 
     private val myRunnable: Runnable = object : Runnable {
         override fun run() {
-            Log.e("MXL", "执行")
             handler.postDelayed(this, 10000)
             id_tv_mach_peoples.showNumberWithAnimation(getNum(), CountNumberView.INTREGEX)
         }
@@ -139,7 +143,6 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
     fun getNum(): Float {
         val random = Random()
         var number = random.nextInt(102) + 402
-        Log.e("MXL", "Number:" + number)
         return number.toFloat()
     }
 
@@ -151,12 +154,10 @@ class ConstellationMachFragment : BaseFragment(), ConstellationContract.View, Ch
     }
 
     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))
         }
 
     }

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

 package com.zxhl.main.page.fragment
 
-import android.util.Log
-import android.view.FrameMetrics
 import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
 import com.flyco.tablayout.listener.CustomTabEntity
-import com.zxhl.cms.common.base.BaseFragment
 import com.zxhl.main.R
 import com.zxhl.main.page.view.BaseViewPagerFragment
 import com.zxhl.main.page.view.TabEntity
+import java.lang.reflect.Field
 
 
 class HomeFragment: BaseViewPagerFragment() {
     override val createTitles = ArrayList<CustomTabEntity>().apply {
         add(TabEntity("Popular"))
-        add(TabEntity("Hot",R.drawable.icon_fire,R.drawable.icon_fire))
+        add(TabEntity("Hot", R.drawable.icon_fire, R.drawable.icon_fire))
 
     }
 
@@ -30,6 +30,7 @@ class HomeFragment: BaseViewPagerFragment() {
 
     override fun init(view: View?) {
         viewPager?.currentItem = 0
+
     }
 
     override fun lazyLoad() {

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

@@ -16,7 +16,7 @@ class MessageFragment: BaseViewPagerFragment() {
     }
 
     override val createFragments: Array<Fragment> = arrayOf(
-        ChatFragment(),
+        ChatFragment.getInstance(),
         LikeFragment.newInstance()
     )
 

moduleMain/src/main/java/com/zxhl/main/page/presenter/ImPresenter.kt

+package com.zxhl.main.page.presenter
+
+import android.util.Log
+import com.zxhl.cms.net.ApiClient
+import com.zxhl.cms.net.RxSchedulers
+import com.zxhl.cms.net.callback.BaseObserver
+import com.zxhl.cms.net.model.chat.IMSignEntity
+import com.zxhl.main.page.contract.ImLoginContract
+
+class ImPresenter :ImLoginContract.Presenter{
+    private val mView: ImLoginContract.View
+
+    constructor(mView: ImLoginContract.View) {
+        this.mView = mView
+    }
+
+    override fun getSign() {
+        ApiClient.homeApi.getAdminKey().compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<IMSignEntity>() {
+                override fun onSuccess(result: IMSignEntity) {
+                    if (result != null) {
+                        Log.e("MXL","成功"+result.key.toString())
+                        mView.getSignSuc(result.key.toString())
+                    }
+
+                }
+
+                override fun onFailure(e: Throwable, code: String, errorMsg: String) {
+                    mView.getSignFail()
+                    Log.e("MXL","请求失败"+code+errorMsg)
+                }
+            })
+    }
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/view/RecyclerviewAtViewPager2.java

+package com.zxhl.main.page.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class RecyclerviewAtViewPager2 extends RecyclerView {
+    public RecyclerviewAtViewPager2(@NonNull Context context) {
+        super(context);
+    }
+
+    public RecyclerviewAtViewPager2(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RecyclerviewAtViewPager2(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+
+    private int startX, startY;
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                startX = (int) ev.getX();
+                startY = (int) ev.getY();
+                getParent().requestDisallowInterceptTouchEvent(true);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                int endX = (int) ev.getX();
+                int endY = (int) ev.getY();
+                int disX = Math.abs(endX - startX);
+                int disY = Math.abs(endY - startY);
+                if (disX > disY) {
+                    getParent().requestDisallowInterceptTouchEvent(canScrollHorizontally(startX - endX));
+                } else {
+                    getParent().requestDisallowInterceptTouchEvent(canScrollVertically(startY - endY));
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                getParent().requestDisallowInterceptTouchEvent(false);
+                break;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+}
\ No newline at end of file

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

@@ -71,7 +71,9 @@
                 <TextView
                     android:id="@+id/id_tv_user_details_age"
                     android:layout_width="wrap_content"
-                    android:layout_height="14dp"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="2dp"
+                    android:paddingBottom="2dp"
                     android:layout_marginRight="8.5dp"
                     android:background="@drawable/shape_ff3b95_r5"
                     android:drawableLeft="@drawable/icon_nv"
@@ -86,8 +88,10 @@
                 <TextView
                     android:id="@+id/id_tv_user_details_online"
                     android:layout_width="wrap_content"
-                    android:layout_height="14dp"
+                    android:layout_height="wrap_content"
                     android:layout_marginRight="8.5dp"
+                    android:paddingTop="2dp"
+                    android:paddingBottom="2dp"
                     android:background="@drawable/shape_03c160_r5"
                     android:gravity="center"
                     android:paddingLeft="5dp"
@@ -99,12 +103,14 @@
                 <TextView
                     android:id="@+id/id_tv_user_details_percentage"
                     android:layout_width="wrap_content"
-                    android:layout_height="14dp"
+                    android:layout_height="wrap_content"
                     android:layout_marginRight="8.5dp"
                     android:background="@drawable/shape_03c160_r5"
                     android:gravity="center"
                     android:paddingLeft="5dp"
                     android:paddingRight="5dp"
+                    android:paddingTop="2dp"
+                    android:paddingBottom="2dp"
                     android:text="0%"
                     android:textColor="@color/white"
                     android:textSize="11sp" />

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

@@ -34,7 +34,7 @@
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
             android:gravity="center"
-            android:text="After blacklisting her,you will not\n be able to send text messages and\n video calls . If you need to remove\n her from the blacklist , please do"
+            android:text="After blacklisting her, you will not\n be able to send text messages and\n video calls. If you need to remove\n her from the blacklist, please do"
             android:textColor="@color/color_333333"
             android:textSize="14sp" />
 

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

@@ -45,7 +45,8 @@
         <!--                    android:adjustViewBounds="true"-->
         <!--                    android:src="@drawable/banner" />-->
         <!--            </LinearLayout>-->
-        <androidx.recyclerview.widget.RecyclerView
+
+        <com.zxhl.main.page.view.RecyclerviewAtViewPager2
             android:id="@+id/id_home_rl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />

moduleUc/src/main/java/com/zxhl/uc/page/fragment/UserCenterFragment.kt

@@ -203,13 +203,18 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
             id_tv_privileage?.text = "privilege"
 //            id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
 //            id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffa211_r15_stoke)
-        } else {
+        } else if(user.memberType == 1){
             id_tv_member_date.visibility = View.VISIBLE
             id_tv_privileage?.visibility = View.GONE
             id_tv_member?.text = "VIP Expiration Date"
             id_tv_member_date?.text = "${user.memberEndTime}"
 //            id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffa211))
 //            id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffffff_ffa211_r15)
+        }else{
+            id_tv_member_date.visibility = View.GONE
+            id_tv_privileage?.visibility = View.GONE
+            id_tv_member?.text = "VIP Expiration Date"
+            id_tv_member_date?.text = "${user.memberEndTime}"
         }
 //        if (user.noRecharged) {
 //            //未充值过

moduleUc/src/main/res/layout/activity_layout_setting.xml

@@ -100,7 +100,9 @@
             android:layout_height="0.5dp"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:background="#EDEDED" />
+            android:background="#EDEDED"
+            android:visibility="gone
+"/>
 
         <RelativeLayout
             android:id="@+id/id_rl_zenzhi_xieyi"
@@ -132,7 +134,8 @@
             android:layout_height="0.5dp"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:background="#EDEDED" />
+            android:background="#EDEDED"
+            android:visibility="gone"/>
 
         <RelativeLayout
             android:id="@+id/id_rl_update"
@@ -164,7 +167,8 @@
             android:layout_height="0.5dp"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:background="#EDEDED" />
+            android:background="#EDEDED"
+            android:visibility="gone"/>
 
         <RelativeLayout
             android:id="@+id/id_rl_about_us"
@@ -214,6 +218,13 @@
                 android:layout_marginRight="15dp"
                 android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="#EDEDED"
+            android:visibility="visible"/>
         <RelativeLayout
             android:id="@+id/id_rl_black_list"
             android:layout_width="match_parent"