Skip to content

S
starlight
Commit 5c2a4896 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改bug

parent 356ffd8c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 776 additions and 58 deletions
cms/src/main/java/com/zxhl/cms/common/NetConfig.java
View file @ 5c2a4896
......@@ -234,7 +234,7 @@ public class NetConfig {
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_LIKEMYLIST = "app/v1/game/star/likeMyList";//我的 - 喜欢我列表
public static final String HOME_STAR_LIGHT_REPORT = "app/v1/game/star/report";//举报
public static final String HOME_STAR_LIGHT_REPORT = "app/v1/hk/game/star/report";//举报
public static final String HOME_STAR_LIGHT_UPDATE_USER_INFO = "app/v1/hk/game/star/updateUserInfo";//我的 - 编辑个人信息
public static final String HOME_STAR_LIGHT_UPDATE_USER_INFO_NO_HEAD_IMG = "app/v1/game/star/updateUserInfo";//我的 - 编辑个人信息 不带头像的
public static final String HOME_STAR_LIGHT_UPDATE_USER_VOICE = "app/v1/game/star/updateUserVoice";//我的 - 编辑语音签名
......
cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt
View file @ 5c2a4896
......@@ -190,7 +190,7 @@ interface IHomeApi {
@POST(NetConfig.StarLight.HOME_STAR_LIGHT_REPORT)
fun report(
@Query("content") content: String,
@Query("userId") userId: String
@Query("userId") userId: String?
): Observable<Response<Any>>
@POST(NetConfig.StarLight.HOME_STAR_LIGHT_SIGN_FEED_BACK)
......
cms/src/main/java/com/zxhl/cms/utils/ChatMessageChargeUtils.kt
View file @ 5c2a4896
......@@ -37,7 +37,8 @@ object ChatMessageChargeUtils {
//语音聊天
const val MESSAGE_CALL_CHAT = 7
//星座匹配
const val MESSAGE_CONSETLLATION_MACH=7
/**
* 查询是否扣费和扣费配置
*/
......
cms/src/main/java/com/zxhl/cms/utils/ReporContentListener.kt 0 → 100644
View file @ 5c2a4896
package com.zxhl.cms.utils
interface ReporContentListener {
fun toReport(string: String)
}
\ No newline at end of file
cms/src/main/res/drawable/shape_bd8aff_662cf5_r20.xml 0 → 100644
View file @ 5c2a4896
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:endColor="#ff662cf5"
android:startColor="#ffbd8aff"
android:type="linear"
android:useLevel="true" />
<corners android:radius="20dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/activity/ConstellReslutActivity.kt
View file @ 5c2a4896
......@@ -22,6 +22,8 @@ import com.zxhl.cms.net.SettingPreference
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.ChatCallback
import com.zxhl.cms.utils.ChatMessageChargeUtils
import com.zxhl.cms.utils.NoDoubleClickListener
import com.zxhl.cms.widget.ChatDialogUtils
import com.zxhl.main.R
......@@ -36,7 +38,8 @@ class ConstellReslutActivity : BaseActivity(), StarMachContract.View, Camera.Pre
var Camerafb = 1
private var mHandler: Handler? = null
private var count: Int = 0
private var ifCharge:Boolean=false
private var ifCharge: Boolean = false
/**
* 创建Camera对象
* 用来获取摄像头
......@@ -59,7 +62,7 @@ class ConstellReslutActivity : BaseActivity(), StarMachContract.View, Camera.Pre
override fun init() {
mediaPlayer = MediaPlayer()
mHandler=Handler()
mHandler = Handler()
mPresenter = StarMachPresenter(this)
mPresenter?.getStarMachReslut()
checkPermission()
......@@ -111,10 +114,10 @@ class ConstellReslutActivity : BaseActivity(), StarMachContract.View, Camera.Pre
id_tv_age?.text = "${result.age}"
id_tv_price?.text = "${result.videoPrice}/min"
if (!TextUtils.isEmpty(result.video)) {
ifCharge=true
ifCharge = true
playVideo(result.video)
}else{
ifCharge=false
} else {
ifCharge = false
}
if (TextUtils.equals(result.sex, "2")) {
id_ll_sex_bg.setBackgroundResource(R.drawable.shape_girl_bg)
......@@ -245,12 +248,29 @@ class ConstellReslutActivity : BaseActivity(), StarMachContract.View, Camera.Pre
}
}
}
private val runnable: Runnable = object : Runnable {
override fun run() {
if(ifCharge==true){
if (ifCharge == true) {
mHandler?.postDelayed(this, 60000)
Log.e("MXL","每隔一分钟去执行扣费")
Log.e("MXL", "每隔一分钟去执行扣费")
ChatMessageChargeUtils.chatImDEduction(
"1",
"" + ChatMessageChargeUtils.MESSAGE_CALL_CHAT,
object : ChatCallback<String> {
override fun onResult(result: String?) {
Log.e("MXL", "扣费成功")
}
override fun onError(code: String?, errorMsg: String?) {
Log.e("MXL", "扣费失败")
if (!TextUtils.isEmpty(code) && code == "105") {
}
}
})
}
}
......
moduleMain/src/main/java/com/zxhl/main/page/activity/UserDetailActivity.kt
View file @ 5c2a4896
......@@ -29,6 +29,7 @@ import com.zxhl.cms.net.model.chat.DistanceEntity
import com.zxhl.cms.utils.*
import com.zxhl.cms.widget.*
import com.zxhl.main.R
import com.zxhl.main.page.`interface`.ReportListener
import com.zxhl.main.page.contract.UserDetailContract
import com.zxhl.main.page.presenter.UserDetailPresenter
import com.zxhl.main.page.view.DialogUtils
......@@ -52,7 +53,7 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
private var mMediaPlayer: MediaPlayer? = null
var chatname: String? = ""
var isTranslucentStatus = false
var chatStaus:Int?=0
var chatStaus: Int? = 0
override fun onClick(v: View?) {
}
......@@ -112,15 +113,18 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
finish()
}
id_img_gengduo?.setOnClickListener {
DialogUtils.showReport(this, View.OnClickListener {
JumpUtils.ReportJump(userId)
DialogUtils.showReport(this, object : ReportListener {
override fun report(pos: Int) {
JumpUtils.ReportJump(userId)
}
})
}
id_img_like?.setOnClickListener {
if (TextUtils.equals(like, "0")) {
like(userId.toString())
// mPresenter?.likeUser(userId, "0")
// like = "1"
// mPresenter?.likeUser(userId, "0")
// like = "1"
} else {
playAnimation()
// like = "0"
......@@ -210,6 +214,7 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
})
id_img_like?.setImageResource(R.drawable.icon_like_click_user)
}
var distanceFree: Int = 0
fun viewDistance(userId: String) {
ChatMessageChargeUtils.getChatMessageChargeOrNot(
......@@ -268,19 +273,20 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
})
}
private var photolist:MutableList<String>?=ArrayList()
private var photolist: MutableList<String>? = ArrayList()
override fun setUserInfo(result: HomeListEntity) {
chatStaus=result?.chatStatus
chatStaus = result?.chatStatus
chatname = result?.nickname
if (result.picturesList?.isNullOrEmpty() == false) {
id_ll_user_photo?.visibility = View.VISIBLE
id_img_top_bg?.setLoadImageUrl(result.picturesList?.get(0), false)
photolist?.clear()
if(result.picturesList?.size!!>8){
for(index in result.picturesList!!.indices){
if(index<8){
if (result.picturesList?.size!! > 8) {
for (index in result.picturesList!!.indices) {
if (index < 8) {
photolist?.add(result.picturesList!![index])
}
}
......@@ -289,13 +295,13 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
id_ll_user_photo?.visibility = View.GONE
id_img_top_bg?.setLoadImageUrl(result?.headImage, false)
}
if(TextUtils.isEmpty(result?.distance)){
id_tv_chakan_juli.visibility=View.VISIBLE
id_tv_distance?.visibility=View.GONE
}else{
id_tv_chakan_juli.visibility=View.GONE
id_tv_distance?.text="${result?.distance}km"
id_tv_distance?.visibility=View.VISIBLE
if (TextUtils.isEmpty(result?.distance)) {
id_tv_chakan_juli.visibility = View.VISIBLE
id_tv_distance?.visibility = View.GONE
} else {
id_tv_chakan_juli.visibility = View.GONE
id_tv_distance?.text = "${result?.distance}km"
id_tv_distance?.visibility = View.VISIBLE
}
follow = result?.hasFollows.toString()
like = result?.hasLikes.toString()
......@@ -414,13 +420,13 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
}
override fun distanceSuc(reslut: DistanceEntity?) {
if(TextUtils.isEmpty(reslut?.distance)){
id_tv_chakan_juli.visibility=View.VISIBLE
id_tv_distance?.visibility=View.GONE
}else{
id_tv_chakan_juli.visibility=View.GONE
id_tv_distance?.text="${reslut?.distance}km"
id_tv_distance?.visibility=View.VISIBLE
if (TextUtils.isEmpty(reslut?.distance)) {
id_tv_chakan_juli.visibility = View.VISIBLE
id_tv_distance?.visibility = View.GONE
} else {
id_tv_chakan_juli.visibility = View.GONE
id_tv_distance?.text = "${reslut?.distance}km"
id_tv_distance?.visibility = View.VISIBLE
}
}
......@@ -442,9 +448,10 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onEvent(chatStausEvent: ChatStausEvent){
chatStaus=chatStausEvent.chatstatus?.toInt()
fun onEvent(chatStausEvent: ChatStausEvent) {
chatStaus = chatStausEvent.chatstatus?.toInt()
}
override fun onDestroy() {
super.onDestroy()
EventBus.getDefault().unregister(this)
......@@ -482,7 +489,9 @@ class UserDetailActivity : BaseActivity(), UserDetailContract.View,
ani.startDelay = delayTime
return ani
}
private var likeFree: String = "0"
//超级喜欢
fun like(userId: String) {
ChatMessageChargeUtils.getChatMessageChargeOrNot(
......
moduleMain/src/main/java/com/zxhl/main/page/activity/UserDetailsActivity.kt
View file @ 5c2a4896
......@@ -6,6 +6,8 @@ import android.graphics.drawable.ColorDrawable
import android.net.Uri
import android.view.*
import android.widget.PopupWindow
import android.util.Log
import android.view.View
import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager
import com.bumptech.glide.Glide
......@@ -16,11 +18,14 @@ import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.model.box.HomeListEntity
import com.zxhl.cms.pay.view.VipPayDialog
import com.zxhl.cms.utils.OnRecycleItemClickListener
import com.zxhl.cms.utils.ReporContentListener
import com.zxhl.cms.utils.Utils
import com.zxhl.main.R
import com.zxhl.main.page.`interface`.ReportListener
import com.zxhl.main.page.adapter.UserPhotosAdapter
import com.zxhl.main.page.contract.UserDetailsContract
import com.zxhl.main.page.presenter.UserDetailsPresenter
import com.zxhl.main.page.view.DialogUtils
import kotlinx.android.synthetic.main.activity_layout_user_details_hw.*
......@@ -70,7 +75,27 @@ class UserDetailsActivity : BaseActivity(), UserDetailsContract.View,
finish()
}
id_img_btn_report -> {
showToast("report")
DialogUtils.showReport(this, object : ReportListener {
override fun report(pos: Int) {
if (pos == 0) {
DialogUtils.showBlackWarning(this@UserDetailsActivity,View.OnClickListener {
mPresenter?.blackUser(userId)
})
} else if (pos == 2) {
DialogUtils.showReportContent(this@UserDetailsActivity,object :ReporContentListener{
override fun toReport(string: String) {
mPresenter?.reportUser(userId,string)
}
})
}
// showToast("Pos"+pos)
}
})
}
id_img_user_details_sms -> {
showToast("sms")
......@@ -154,6 +179,19 @@ class UserDetailsActivity : BaseActivity(), UserDetailsContract.View,
}
}
override fun blackCallBack(boolean: Boolean) {
if(boolean){
showToast("Add to Blacklist Successful")
finish()
}
}
override fun reportCallback(boolean: Boolean) {
if(boolean){
showToast("Report Success")
}
}
override fun onItemClick(view: View?, position: Int, data: String?) {
mPhotoAdapter?.setSelectPhoto(position)
id_sfv_user_detail_video.visibility = View.INVISIBLE
......
moduleMain/src/main/java/com/zxhl/main/page/contract/UserDetailsContract.kt
View file @ 5c2a4896
......@@ -8,10 +8,15 @@ class UserDetailsContract {
interface View {
fun setUserDetails(result: HomeListEntity)
fun likeCallBack(boolean: Boolean)
fun blackCallBack(boolean: Boolean)
fun reportCallback(boolean: Boolean)
}
interface Presenter {
fun getUserDetails(id: String?,free: String?)
fun likeUser(uid: String?,free: String?)
fun blackUser(uid:String?)
fun reportUser(uid: String?,content:String)
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/interface/ReportListener.kt 0 → 100644
View file @ 5c2a4896
package com.zxhl.main.page.`interface`
interface ReportListener {
fun report(pos:Int)
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/presenter/UserDetailsPresenter.kt
View file @ 5c2a4896
......@@ -44,4 +44,35 @@ class UserDetailsPresenter : UserDetailsContract.Presenter {
})
}
override fun blackUser(uid: String?) {
ApiClient.homeApi.blackUser(uid).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<Any>() {
override fun onSuccess(result: Any?) {
mView.blackCallBack(true)
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.e("MXL", "ERROR" + code + errorMsg)
mView.blackCallBack(false)
}
})
}
override fun reportUser(uid: String?,content:String) {
ApiClient.homeApi.report(content, uid)
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<Any>() {
override fun onSuccess(result: Any?) {
if (result != null) {
mView.reportCallback(true)
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
mView.reportCallback(false)
Log.e("MXL", "ERROR" + code + errorMsg + e)
}
})
}
}
\ No newline at end of file
moduleMain/src/main/res/layout/dialog_layout_block_waring.xml 0 → 100644
View file @ 5c2a4896
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_ffffff_r10"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:src="@drawable/icon_jinggao" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="15dp"
android:text="Warning"
android:textColor="@color/color_333333"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:textColor="@color/color_333333"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
android:text=" so in "
android:textColor="@color/color_333333"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
android:text="SETTING"
android:textColor="@color/color_824fff"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="20dp">
<TextView
android:id="@+id/id_tv_back"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/shape_824fff_r20_bg"
android:gravity="center"
android:text="Back"
android:textColor="@color/color_824fff"
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_cancellation"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/shape_bd8aff_662cf5_r20"
android:gravity="center"
android:text="Cancellation"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
moduleMain/src/main/res/layout/dialog_layout_report.xml
View file @ 5c2a4896
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
android:background="@color/white"
android:orientation="vertical">
<ImageView
android:id="@+id/id_img_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="20dp"
android:src="@drawable/icon_guanbi" />
android:src="@drawable/icon_guanbi"
android:visibility="gone" />
<TextView
android:id="@+id/id_tv_add_to_blacklist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="20dp"
android:text="Add to Blacklist"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="#EDEDED" />
<TextView
android:id="@+id/id_tv_delete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="20dp"
android:text="Delete"
android:visibility="gone"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:visibility="gone"
android:background="#EDEDED" />
<TextView
android:id="@+id/id_tv_report"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="20dp"
android:text="Report"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="#EDEDED" />
<TextView
android:id="@+id/id_tv_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="20dp"
android:text="Cancel"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="25dp"
android:drawableTop="@drawable/icon_jubao"
android:drawablePadding="10dp"
android:gravity="center"
android:text="举报"
android:drawablePadding="10dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="25dp"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</RelativeLayout>
android:textSize="13sp"
android:visibility="gone" />
</LinearLayout>
moduleMain/src/main/res/layout/dialog_layout_report_content.xml 0 → 100644
View file @ 5c2a4896
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:background="@drawable/shape_ffffff_r10"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:id="@+id/id_ll_advertising"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Advertising"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_advertising"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_weixuan_zise4" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#EDEDED" />
<LinearLayout
android:id="@+id/id_ll_harass_me"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Harass me"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_harass_me"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_weixuan_zise4_2" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#EDEDED" />
<LinearLayout
android:id="@+id/id_ll_copycat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Copycat"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_copy_cat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_weixuan_zise4_2" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#EDEDED" />
<LinearLayout
android:id="@+id/id_ll_lllegal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Illegal or criminal"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_lllegal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_weixuan_zise4_2" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#EDEDED" />
<LinearLayout
android:id="@+id/id_ll_sexual"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Sexual hint"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_sexual"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_weixuan_zise4_2" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#EDEDED" />
<LinearLayout
android:id="@+id/id_ll_other"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Other"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/id_img_other"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_weixuan_zise4_2" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#EDEDED" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="20dp">
<TextView
android:id="@+id/id_tv_back"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/shape_824fff_r20_bg"
android:gravity="center"
android:text="Back"
android:textColor="@color/color_824fff"
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_continue"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/shape_bd8aff_662cf5_r20"
android:gravity="center"
android:text="Continue"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
moduleMain/src/main/res/layout/layout_test.xml 0 → 100644
View file @ 5c2a4896
<?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="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#05042E">
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#565656">
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@drawable/xingzuo_reslut_bottom_bg">
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:src="@drawable/quxian" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_xin_tiao" />
</RelativeLayout>
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/ui/view/input/InputView.java
View file @ 5c2a4896
......@@ -820,7 +820,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jianpan);
hideSoftInput();
} else {
mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_liaotian);
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao);
mSendAudioButton.setVisibility(GONE);
mTextInput.setVisibility(VISIBLE);
showSoftInput();
......@@ -828,7 +828,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
} else if (view.getId() == R.id.face_btn) {
if (mCurrentState == STATE_VOICE_INPUT) {
mCurrentState = STATE_NONE_INPUT;
mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_liaotian);
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao);
mSendAudioButton.setVisibility(GONE);
mTextInput.setVisibility(VISIBLE);
}
......@@ -862,7 +862,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
} else {
showInputMoreLayout();//显示“更多”消息发送布局
mCurrentState = STATE_ACTION_INPUT;
mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_liaotian);
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao);
mEmojiInputButton.setImageResource(R.drawable.icon_biaoqing_liaotian);
mSendAudioButton.setVisibility(GONE);
mTextInput.setVisibility(VISIBLE);
......@@ -932,7 +932,7 @@ public class InputView extends LinearLayout implements IInputLayout, View.OnClic
public void showSoftInput() {
TUIChatLog.i(TAG, "showSoftInput");
hideInputMoreLayout();
mAudioInputSwitchButton.setImageResource(R.drawable.icon_yuyin_liaotian);
mAudioInputSwitchButton.setImageResource(R.drawable.icon_jinggao);
mEmojiInputButton.setImageResource(R.drawable.chat_input_face);
mCurrentState = STATE_SOFT_INPUT;
mSendAudioButton.setVisibility(GONE);
......
tuichat/src/main/res/layout/chat_input_layout.xml
View file @ 5c2a4896
......@@ -28,7 +28,7 @@
android:layout_height="25dp"
android:layout_gravity="bottom"
android:layout_margin="16dp"
android:src="@drawable/icon_yuyin_liaotian" />
android:src="@drawable/icon_jinggao" />
<com.tencent.qcloud.tuikit.tuichat.ui.view.input.TIMMentionEditText
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