Commit a42f7c81 authored by maxiaoliang's avatar maxiaoliang

修改

parent 772eb653
...@@ -70,5 +70,5 @@ dependencies { ...@@ -70,5 +70,5 @@ dependencies {
implementation project(':cms') implementation project(':cms')
implementation 'com.github.li-xiaojun:XPopup:2.0.0' implementation 'com.github.li-xiaojun:XPopup:2.0.0'
api "com.tencent.liteav:LiteAVSDK_TRTC:latest.release" api "com.tencent.liteav:LiteAVSDK_TRTC:latest.release"
api "com.tencent.imsdk:imsdk-plus:latest.release" // api "com.tencent.imsdk:imsdk-plus:latest.release"
} }
...@@ -239,6 +239,7 @@ public class ChatFragment extends BaseFragment implements ChatContract.View, V2T ...@@ -239,6 +239,7 @@ public class ChatFragment extends BaseFragment implements ChatContract.View, V2T
@Override @Override
protected void lazyLoad() { protected void lazyLoad() {
super.lazyLoad(); super.lazyLoad();
Log.e("MXL","isInitial"+isInitial);
if (!isFirstLoad&& isInitial) { if (!isFirstLoad&& isInitial) {
login(SettingPreference.getUserInfoData().uid + ""); login(SettingPreference.getUserInfoData().uid + "");
} }
......
...@@ -157,7 +157,7 @@ public class NetConfig { ...@@ -157,7 +157,7 @@ public class NetConfig {
public static final String URL_AUTH_FACEBOOK_LOGIN = "app/v1/auth/facebookLogin";//绑定FaceBook登录 public static final String URL_AUTH_FACEBOOK_LOGIN = "app/v1/auth/facebookLogin";//绑定FaceBook登录
///unifiedpay/gateway/google/替换包名/notify/order ///unifiedpay/gateway/google/替换包名/notify/order
public static final String URL_GOOGLE_NOTIFY = URL_PAY_BASE + "unifiedpay/gateway/google/com.zhangxin.magicbox/notify/order"; public static final String URL_GOOGLE_NOTIFY = URL_PAY_BASE + "unifiedpay/gateway/google/com.zhangxin.starlight/notify/order";
} }
...@@ -231,10 +231,10 @@ public class NetConfig { ...@@ -231,10 +231,10 @@ public class NetConfig {
public static final String HOME_STAR_LIGHT_LIST = "app/v1/hk/game/star/pageList";//首页列表 public static final String HOME_STAR_LIGHT_LIST = "app/v1/hk/game/star/pageList";//首页列表
public static final String HOME_STAR_LIGHT_USER_INFO = "app/v1/hk/game/star/getUserInfo";//访问他人主页 public static final String HOME_STAR_LIGHT_USER_INFO = "app/v1/hk/game/star/getUserInfo";//访问他人主页
public static final String HOME_STAR_LIGHT_USER_LIKE = "app/v1/hk/game/star/like";//喜欢/取消喜欢 public static final String HOME_STAR_LIGHT_USER_LIKE = "app/v1/hk/game/star/like";//喜欢/取消喜欢
public static final String HOME_STAR_LIGHT_USER_FOLLOW = "app/v1/game/star/follow";//关注用户/取消关注 public static final String HOME_STAR_LIGHT_USER_FOLLOW = "app/v1//hk/game/star/follow";//关注用户/取消关注
public static final String HOME_STAR_LIGHT_ADD_USERINFO = "app/v1/game/star/addUserInfo";//注册 - 填写资料 public static final String HOME_STAR_LIGHT_ADD_USERINFO = "app/v1/hk/game/star/addUserInfo";//注册 - 填写资料
public static final String HOME_STAR_LIGHT_UPLOAD = "app/v1/game/star/upload";//上传图片 public static final String HOME_STAR_LIGHT_UPLOAD = "app/v1/hk/game/star/upload";//上传图片
public static final String HOME_STAR_LIGHT_PICTURES = "app/v1/game/star/pictures";//我的 - 更新相册 public static final String HOME_STAR_LIGHT_PICTURES = "app/v1/hk/game/star/pictures";//我的 - 更新相册
public static final String HOME_STAR_LIGHT_FOLLOWLIST = "app/v1/game/star/followList";//我的 - 关注列表 public static final String HOME_STAR_LIGHT_FOLLOWLIST = "app/v1/game/star/followList";//我的 - 关注列表
public static final String HOME_STAR_LIGHT_FANLIST = "app/v1/game/star/fanList";//我的 - 粉丝列表 public static final String HOME_STAR_LIGHT_FANLIST = "app/v1/game/star/fanList";//我的 - 粉丝列表
public static final String HOME_STAR_LIGHT_LIKEMYLIST = "app/v1/game/star/likeMyList";//我的 - 喜欢我列表 public static final String HOME_STAR_LIGHT_LIKEMYLIST = "app/v1/game/star/likeMyList";//我的 - 喜欢我列表
...@@ -247,7 +247,7 @@ public class NetConfig { ...@@ -247,7 +247,7 @@ public class NetConfig {
public static final String HOME_STAR_LIGHT_RECEIVE_NEW_USER = "app/v1/game/star/receiveNewUser";//领取新人奖励 public static final String HOME_STAR_LIGHT_RECEIVE_NEW_USER = "app/v1/game/star/receiveNewUser";//领取新人奖励
public static final String HOME_STAR_LIGHT_SIGN_LIST = "app/v2/game/common/signList";//签到奖励列表 public static final String HOME_STAR_LIGHT_SIGN_LIST = "app/v2/game/common/signList";//签到奖励列表
public static final String HOME_STAR_LIGHT_SIGN_RECEIVE = "app/v1/game/common/signReceive";//签到奖励领取 public static final String HOME_STAR_LIGHT_SIGN_RECEIVE = "app/v1/game/common/signReceive";//签到奖励领取
public static final String HOME_STAR_LIGHT_SIGN_FEED_BACK = "app/v1/game/star/feedback";//意见反馈 public static final String HOME_STAR_LIGHT_SIGN_FEED_BACK = "app/v1/hk/game/star/feedback";//意见反馈
public static final String HOME_STAR_LIGHT_RECOMMEND_CHAT_UP = "app/v1/game/star/getRecommendedChatUp";//推荐搭讪用户 public static final String HOME_STAR_LIGHT_RECOMMEND_CHAT_UP = "app/v1/game/star/getRecommendedChatUp";//推荐搭讪用户
public static final String HOME_STAR_LIGHT_ONE_CLICK_CHAT_UP = "app/v1/game/star/oneClickChatUp";//一键搭讪 public static final String HOME_STAR_LIGHT_ONE_CLICK_CHAT_UP = "app/v1/game/star/oneClickChatUp";//一键搭讪
public static final String HOME_STAR_LIGHT_SYNC_POSITION = "app/v1/game/star/syncPosition";//同步最后一次位置信息 public static final String HOME_STAR_LIGHT_SYNC_POSITION = "app/v1/game/star/syncPosition";//同步最后一次位置信息
...@@ -256,16 +256,16 @@ public class NetConfig { ...@@ -256,16 +256,16 @@ public class NetConfig {
public static final String HOME_STAR_LIGHT_GET_ADMIN_KEY = "app/v1/hk/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_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_SEND_MESSAGE = "app/v1/game/star/sendMsg";//发送消息
public static final String HOME_STAR_LIGHT_MESSAGE_LIST = "app/v1/game/star/messageList";//最近联系人 - 消息列表 public static final String HOME_STAR_LIGHT_MESSAGE_LIST = "app/v1/hk/game/star/messageList";//最近联系人 - 消息列表
public static final String HOME_STAR_LIGHT_MESSAGE_GIFT_LIST = "app/v1/game/star/giftList";//礼物列表 public static final String HOME_STAR_LIGHT_MESSAGE_GIFT_LIST = "app/v1/hk/game/star/giftList";//礼物列表
public static final String HOME_STAR_LIGHT_MESSAGE_SEND_GIFT = "app/v1/game/star/gift";//送礼物 public static final String HOME_STAR_LIGHT_MESSAGE_SEND_GIFT = "app/v1/hk/game/star/gift";//送礼物
public static final String HOME_STAR_LIGHT_MESSAGE_STAR_VALUE = "app/v1/game/star/getUserValue";//查询与好友亲密度和心动值 public static final String HOME_STAR_LIGHT_MESSAGE_STAR_VALUE = "app/v1/hk/game/star/getUserValue";//查询与好友亲密度和心动值
public static final String HOME_STAR_LIGHT_MESSAGE_CHARGE_OR_NOT = "app/v1/game/star/chargeOrNot";//查询发送消息是否需要收费 public static final String HOME_STAR_LIGHT_MESSAGE_CHARGE_OR_NOT = "app/v1/hk/game/star/chargeOrNot";//查询发送消息是否需要收费
public static final String HOME_STAR_LIGHT_MESSAGE_IM_DEDUCTION = "app/v1/game/star/im/deduction";//发送消息扣费 public static final String HOME_STAR_LIGHT_MESSAGE_IM_DEDUCTION = "app/v1/hk/game/star/im/deduction";//发送消息扣费
public static final String HOME_STAR_LIGHT_MESSAGE_SEND_MESSAGE = "app/v1/game/star/sendMsg";//发送消息 public static final String HOME_STAR_LIGHT_MESSAGE_SEND_MESSAGE = "app/v1/hk/game/star/sendMsg";//发送消息
public static final String HOME_STAR_LIGHT_MESSAGE_LOG = "app/v1/game/star/getChatLog";//获取聊天记录 public static final String HOME_STAR_LIGHT_MESSAGE_LOG = "app/v1/hk/game/star/getChatLog";//获取聊天记录
public static final String HOME_STAR_LIGHT_MESSAGE_CHATUP_TEMPLATE = "app/v1/game/star/getChatUpTemplate";//获取搭讪聊天模版 public static final String HOME_STAR_LIGHT_MESSAGE_CHATUP_TEMPLATE = "app/v1/hk/game/star/getChatUpTemplate";//获取搭讪聊天模版
public static final String HOME_STAR_LIGHT_IM_FREE_REPORT = "app/v1/game/star/im/freeReport";//上报 public static final String HOME_STAR_LIGHT_IM_FREE_REPORT = "app/v1/hk/game/star/im/freeReport";//上报
public static final String HOME_STAR_LIGHT_HAS_WINTER_BOX = "app/v1/game/star/hasWinterBox";//是否弹冬日盲盒 public static final String HOME_STAR_LIGHT_HAS_WINTER_BOX = "app/v1/game/star/hasWinterBox";//是否弹冬日盲盒
public static final String HOME_STAR_LIGHT_GET_WINTER_BOX = "app/v1/game/star/getWinterBox";//获取冬日盲盒详情 public static final String HOME_STAR_LIGHT_GET_WINTER_BOX = "app/v1/game/star/getWinterBox";//获取冬日盲盒详情
public static final String HOME_STAR_LIGHT_OPEN_WINTER_BOX = "app/v1/game/star/openWinterBox";//开启冬日盲盒 public static final String HOME_STAR_LIGHT_OPEN_WINTER_BOX = "app/v1/game/star/openWinterBox";//开启冬日盲盒
......
#!/usr/bin/env sh #!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
############################################################################## ##############################################################################
## ##
## Gradle start up script for UN*X ## Gradle start up script for UN*X
...@@ -44,7 +28,7 @@ APP_NAME="Gradle" ...@@ -44,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"
...@@ -82,7 +66,6 @@ esac ...@@ -82,7 +66,6 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
...@@ -126,11 +109,10 @@ if $darwin; then ...@@ -126,11 +109,10 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin or MSYS, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath
...@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then ...@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=`expr $i + 1` i=$((i+1))
done done
case $i in case $i in
0) set -- ;; (0) set -- ;;
1) set -- "$args0" ;; (1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;; (2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;; (3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;; (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
...@@ -177,9 +159,14 @@ save () { ...@@ -177,9 +159,14 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=`save "$@"` APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"
...@@ -464,7 +464,7 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa ...@@ -464,7 +464,7 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
RequestBody.create("multipart/form-data".toMediaTypeOrNull(), f) RequestBody.create("multipart/form-data".toMediaTypeOrNull(), f)
val fileBody = val fileBody =
MultipartBody.Part.createFormData("file", f.name, requestFile) MultipartBody.Part.createFormData("file", f.name, requestFile)
mLoading?.setLoading("上传中") mLoading?.setLoading("uploading")
mLoading?.show() mLoading?.show()
mPresenter?.upload(fileBody) mPresenter?.upload(fileBody)
//写上报地址获取url逻辑,成功or失败, 成功调 mImgUrlList.add(url) checkImgList(0) //写上报地址获取url逻辑,成功or失败, 成功调 mImgUrlList.add(url) checkImgList(0)
......
...@@ -271,7 +271,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -271,7 +271,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
private fun onReport(data: HomeListEntity, position: Int) { private fun onReport(data: HomeListEntity, position: Int) {
if (!data.isUpload) { if (!data.isUpload) {
// Log.d("glc", "postion:"+position+"我被上报了:" + data.nickname) // Log.d("glc", "postion:"+position+"我被上报了:" + data.nickname)
EventUtils.onEvent("HomeUserShow", "" + data.uid) // EventUtils.onEvent("HomeUserShow", "" + data.uid)
mList[position].isUpload = true mList[position].isUpload = true
} }
} }
...@@ -297,6 +297,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -297,6 +297,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
var id_img_guoqi: RecycleImageView var id_img_guoqi: RecycleImageView
var id_tv_countryEn: TextView var id_tv_countryEn: TextView
var id_tv_chat_price: TextView var id_tv_chat_price: TextView
var id_img_video: ImageView
constructor(itemView: View) : super(itemView) { constructor(itemView: View) : super(itemView) {
img = itemView.findViewById(R.id.id_img_photo) img = itemView.findViewById(R.id.id_img_photo)
...@@ -318,6 +319,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -318,6 +319,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
id_img_guoqi = itemView.findViewById(R.id.id_img_guoqi) id_img_guoqi = itemView.findViewById(R.id.id_img_guoqi)
id_tv_countryEn = itemView.findViewById(R.id.id_tv_countryEn) id_tv_countryEn = itemView.findViewById(R.id.id_tv_countryEn)
id_tv_chat_price = itemView.findViewById(R.id.id_tv_chat_price) id_tv_chat_price = itemView.findViewById(R.id.id_tv_chat_price)
id_img_video = itemView.findViewById(R.id.id_img_video)
id_img_home_like.setOnClickListener(object : NoDoubleClickListener() { id_img_home_like.setOnClickListener(object : NoDoubleClickListener() {
override fun onNoDoubleClick(v: View?) { override fun onNoDoubleClick(v: View?) {
val pos = adapterPosition val pos = adapterPosition
...@@ -341,6 +343,16 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -341,6 +343,16 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
} }
} }
})
id_img_video.setOnClickListener(object :NoDoubleClickListener(){
override fun onNoDoubleClick(v: View?) {
val pos = adapterPosition
Log.e("MXL", "pos" + pos)
if (pos >= 0 && pos < mList.size) {
listener.onItemClick(v, pos, mList[pos])
}
}
}) })
id_rl_play_audio.setOnClickListener { id_rl_play_audio.setOnClickListener {
val pos = adapterPosition val pos = adapterPosition
......
package com.zxhl.main.page.fragment package com.zxhl.main.page.fragment
import android.text.TextUtils
import android.view.View import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.ym.chat.utils.TUIUtils
import com.zxhl.cms.common.base.BaseFragment import com.zxhl.cms.common.base.BaseFragment
import com.zxhl.cms.net.model.chat.ChatStausEvent import com.zxhl.cms.net.model.chat.ChatStausEvent
import com.zxhl.cms.net.model.chat.FollowEntity import com.zxhl.cms.net.model.chat.FollowEntity
...@@ -11,6 +13,7 @@ import com.zxhl.main.R ...@@ -11,6 +13,7 @@ import com.zxhl.main.R
import com.zxhl.main.page.adapter.LikesAdpater import com.zxhl.main.page.adapter.LikesAdpater
import com.zxhl.main.page.contract.MyLikesContract import com.zxhl.main.page.contract.MyLikesContract
import com.zxhl.main.page.presenter.MyLikesPresenter import com.zxhl.main.page.presenter.MyLikesPresenter
import com.zxhl.main.page.view.DialogUtils
import kotlinx.android.synthetic.main.activity_layout_my_likes.* import kotlinx.android.synthetic.main.activity_layout_my_likes.*
import kotlinx.android.synthetic.main.layout_empty_view.* import kotlinx.android.synthetic.main.layout_empty_view.*
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
...@@ -29,10 +32,17 @@ class LikeFragment : BaseFragment(), MyLikesContract.View, ...@@ -29,10 +32,17 @@ class LikeFragment : BaseFragment(), MyLikesContract.View,
mPresenter = MyLikesPresenter(this) mPresenter = MyLikesPresenter(this)
initAdapter() initAdapter()
} }
var mylikeEntity:FollowEntity?=null
override fun onItemClick(view: View?, position: Int, data: FollowEntity?) { override fun onItemClick(view: View?, position: Int, data: FollowEntity?) {
mylikeEntity=data when (view?.id) {
JumpUtils.startC2CChatActivity(mylikeEntity?.chatStatus!!,data?.uid, data?.nickname) R.id.id_img_xiaoxi -> {
JumpUtils.startC2CChatActivity(1,data?.uid, data?.nickname)
}
R.id.id_img_shipin -> {
TUIUtils.CallVideo("128814")
}
}
} }
override fun onResume() { override fun onResume() {
...@@ -90,12 +100,7 @@ class LikeFragment : BaseFragment(), MyLikesContract.View, ...@@ -90,12 +100,7 @@ class LikeFragment : BaseFragment(), MyLikesContract.View,
id_ll_empty?.visibility = View.VISIBLE id_ll_empty?.visibility = View.VISIBLE
id_tv_empty_text.text = "No Content" id_tv_empty_text.text = "No Content"
} }
@Subscribe(threadMode = ThreadMode.MAIN)
fun onEvent(chatStausEvent: ChatStausEvent){
mylikeEntity?.chatStatus=chatStausEvent.chatstatus?.toInt()
mAdapter?.notifyDataSetChanged()
//chatStaus=chatStausEvent.chatstatus?.toInt()
}
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
// EventBus.getDefault().unregister(this) // EventBus.getDefault().unregister(this)
......
package com.zxhl.main.page.fragment package com.zxhl.main.page.fragment
import android.util.Log
import android.view.View import android.view.View
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.flyco.tablayout.listener.CustomTabEntity import com.flyco.tablayout.listener.CustomTabEntity
...@@ -31,6 +32,7 @@ class MessageFragment: BaseViewPagerFragment() { ...@@ -31,6 +32,7 @@ class MessageFragment: BaseViewPagerFragment() {
override fun lazyLoad() { override fun lazyLoad() {
super.lazyLoad() super.lazyLoad()
Log.e("MXL","isInitial:"+isInitial+"isVisible:"+isVisible)
if (isVisible && isInitial) { if (isVisible && isInitial) {
createFragments[viewPager?.currentItem ?: 0].userVisibleHint = true createFragments[viewPager?.currentItem ?: 0].userVisibleHint = true
} }
......
...@@ -7,6 +7,9 @@ import android.util.Log ...@@ -7,6 +7,9 @@ import android.util.Log
import android.view.View import android.view.View
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.SimpleItemAnimator import androidx.recyclerview.widget.SimpleItemAnimator
import com.tencent.trtc.TRTCCloud
import com.tencent.trtc.TRTCCloudDef
import com.ym.chat.utils.TUIUtils
import com.zxhl.cms.common.base.BaseFragment import com.zxhl.cms.common.base.BaseFragment
import com.zxhl.cms.down.UpdateVersionManager import com.zxhl.cms.down.UpdateVersionManager
import com.zxhl.cms.net.SettingPreference import com.zxhl.cms.net.SettingPreference
...@@ -122,17 +125,21 @@ class PopularFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickLis ...@@ -122,17 +125,21 @@ class PopularFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickLis
// mPresenter?.getHomeList(false) // mPresenter?.getHomeList(false)
// } // }
if (mAdapter?.getLoadMore() == true) { if (mAdapter?.getLoadMore() == true) {
ifChareOrNot(false) // mPresenter?.getHomeList(false)
mPresenter?.getHomeList(false, free,"popular")
// ifChareOrNot(false)
} }
} }
}) })
id_refresh_layout?.setColorSchemeColors(resources.getColor(com.zxhl.cms.R.color.color_aa60ff)) id_refresh_layout?.setColorSchemeColors(resources.getColor(com.zxhl.cms.R.color.color_aa60ff))
id_refresh_layout?.setOnRefreshListener { id_refresh_layout?.setOnRefreshListener {
//helper=null //helper=null
ifChareOrNot(true) // ifChareOrNot(true)
mPresenter?.getHomeList(true, free,"popular")
// //
} }
ifChareOrNot(true) //ifChareOrNot(true)
mPresenter?.getHomeList(true, free,"popular")
// helper = OnItemEnterOrExitVisibleHelper() // helper = OnItemEnterOrExitVisibleHelper()
// helper?.setRecyclerScrollListener(id_home_rl) // helper?.setRecyclerScrollListener(id_home_rl)
// helper?.setOnScrollStatusListener(this) // helper?.setOnScrollStatusListener(this)
...@@ -256,6 +263,12 @@ class PopularFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickLis ...@@ -256,6 +263,12 @@ class PopularFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickLis
chatEntity=data chatEntity=data
JumpUtils.startC2CChatActivity(chatEntity?.chatStatus!!,data?.uid, data?.nickname) JumpUtils.startC2CChatActivity(chatEntity?.chatStatus!!,data?.uid, data?.nickname)
} }
R.id.id_img_video->{
Log.e("MXL:","status:"+chatEntity?.chatStatus)
chatEntity=data
JumpUtils.startC2CChatActivity(1,"128814", data?.nickname)
// TUIUtils.CallVideo("128814")
}
R.id.id_rl_play_audio -> { R.id.id_rl_play_audio -> {
EventUtils.onEvent("HomeAudioPlay",data?.uid.toString()) EventUtils.onEvent("HomeAudioPlay",data?.uid.toString())
// mAdapter?.setHasStableIds(true) // mAdapter?.setHasStableIds(true)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bj_splash"> android:background="@color/white">
<TextView <TextView
android:id="@+id/id_activity_splash_skip" android:id="@+id/id_activity_splash_skip"
...@@ -23,23 +23,50 @@ ...@@ -23,23 +23,50 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/yuan_1" android:layout_marginLeft="10dp"
android:layout_marginTop="110dp" android:layout_marginTop="110dp"
android:layout_marginLeft="10dp"/> android:src="@drawable/yuan_1"
android:visibility="gone" />
<ImageView <ImageView
android:layout_width="109dp" android:layout_width="90dp"
android:layout_height="109dp" android:layout_height="90dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="118dp" android:layout_marginTop="100dp"
android:src="@mipmap/ic_launcher" /> android:src="@mipmap/ic_launcher" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/yuan_2" android:layout_centerHorizontal="true"
android:layout_marginTop="199dp"
android:src="@drawable/splash_font" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="280dp"
android:text="Have some fun"
android:textColor="#FF3B95"
android:textSize="24sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="160dp"
android:layout_marginRight="36dp" android:layout_marginRight="36dp"
android:layout_alignParentRight="true"/> android:layout_marginBottom="160dp"
android:src="@drawable/yuan_2"
android:visibility="gone" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:adjustViewBounds="true"
android:src="@drawable/splash_bottom_photo" />
<FrameLayout <FrameLayout
android:id="@+id/id_activity_splash_ad_layout" android:id="@+id/id_activity_splash_ad_layout"
...@@ -52,7 +79,8 @@ ...@@ -52,7 +79,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="gone">
<TextView <TextView
......
...@@ -244,6 +244,7 @@ ...@@ -244,6 +244,7 @@
android:layout_marginBottom="-10dp" /> android:layout_marginBottom="-10dp" />
<ImageView <ImageView
android:id="@+id/id_img_video"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
......
...@@ -820,7 +820,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic ...@@ -820,7 +820,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jianpan); mAudioInputSwitchButton.setImageResource(R.drawable.icon_jianpan);
hideSoftInput(); hideSoftInput();
} else { } else {
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao); mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_mic);
mSendAudioButton.setVisibility(GONE); mSendAudioButton.setVisibility(GONE);
mTextInput.setVisibility(VISIBLE); mTextInput.setVisibility(VISIBLE);
showSoftInput(); showSoftInput();
...@@ -828,7 +828,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic ...@@ -828,7 +828,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
} else if (view.getId() == R.id.face_btn) { } else if (view.getId() == R.id.face_btn) {
if (mCurrentState == STATE_VOICE_INPUT) { if (mCurrentState == STATE_VOICE_INPUT) {
mCurrentState = STATE_NONE_INPUT; mCurrentState = STATE_NONE_INPUT;
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao); mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_mic);
mSendAudioButton.setVisibility(GONE); mSendAudioButton.setVisibility(GONE);
mTextInput.setVisibility(VISIBLE); mTextInput.setVisibility(VISIBLE);
} }
...@@ -862,7 +862,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic ...@@ -862,7 +862,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
} else { } else {
showInputMoreLayout();//显示“更多”消息发送布局 showInputMoreLayout();//显示“更多”消息发送布局
mCurrentState = STATE_ACTION_INPUT; mCurrentState = STATE_ACTION_INPUT;
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao); mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_mic);
mEmojiInputButton.setImageResource(R.drawable.icon_biaoqing_liaotian); mEmojiInputButton.setImageResource(R.drawable.icon_biaoqing_liaotian);
mSendAudioButton.setVisibility(GONE); mSendAudioButton.setVisibility(GONE);
mTextInput.setVisibility(VISIBLE); mTextInput.setVisibility(VISIBLE);
...@@ -932,7 +932,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic ...@@ -932,7 +932,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
public void showSoftInput() { public void showSoftInput() {
TUIChatLog.i(TAG, "showSoftInput"); TUIChatLog.i(TAG, "showSoftInput");
hideInputMoreLayout(); hideInputMoreLayout();
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao); mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_mic);
mEmojiInputButton.setImageResource(R.drawable.chat_input_face); mEmojiInputButton.setImageResource(R.drawable.chat_input_face);
mCurrentState = STATE_SOFT_INPUT; mCurrentState = STATE_SOFT_INPUT;
mSendAudioButton.setVisibility(GONE); mSendAudioButton.setVisibility(GONE);
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
android:layout_height="25dp" android:layout_height="25dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@drawable/icon_jinggao" /> android:src="@drawable/icon_yuyin_mic" />
<com.tencent.qcloud.tuikit.tuichat.ui.view.input.TIMMentionEditText <com.tencent.qcloud.tuikit.tuichat.ui.view.input.TIMMentionEditText
android:id="@+id/chat_message_input" android:id="@+id/chat_message_input"
......
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