Skip to content

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

修改个人中心页面

parent 36b60d96
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 235 deletions
cms/src/main/java/com/zxhl/cms/common/NetConfig.java
View file @ 73418428
...@@ -202,9 +202,9 @@ public class NetConfig { ...@@ -202,9 +202,9 @@ public class NetConfig {
} }
public static class H5 { public static class H5 {
public static String WEB_URL_USER = "https://newspool.zhangxinhulian.com//sspapiNovel/su/custom/xgchat/user_service.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司"; public static String WEB_URL_USER = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xgchat/hk/StarlightTermsOfService.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
public static String WEB_URL_PRIVACY = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xgchat/privacy.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司"; public static String WEB_URL_PRIVACY = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xgchat/hk/StarlightPrivacyPolicy.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司"; public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
......
cms/src/main/java/com/zxhl/cms/router/RounterApi.kt
View file @ 73418428
...@@ -218,4 +218,8 @@ interface RounterApi { ...@@ -218,4 +218,8 @@ interface RounterApi {
@RounterUri(Constant.scheme + "://loginbefore") @RounterUri(Constant.scheme + "://loginbefore")
fun getIntentLoginBefore(): Intent fun getIntentLoginBefore(): Intent
@RounterUri(Constant.scheme + "://blocklist")
fun getIntentBlockList(): Intent
} }
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/utils/JumpUtils.java
View file @ 73418428
...@@ -212,6 +212,15 @@ public class JumpUtils { ...@@ -212,6 +212,15 @@ public class JumpUtils {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！"); Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
} }
} }
public static void BlockListJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentBlockList();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
AppContext.get().startActivity(intent);
} catch (Exception e) {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void UserInfoJump() { public static void UserInfoJump() {
......
cms/src/main/res/values/colors.xml
View file @ 73418428
...@@ -40,5 +40,6 @@ ...@@ -40,5 +40,6 @@
<color name="e4d8ce">#E4D8CE</color> <color name="e4d8ce">#E4D8CE</color>
<color name="ffa211">#FFA211</color> <color name="ffa211">#FFA211</color>
<color name="ffc217">#FFC217</color> <color name="ffc217">#FFC217</color>
<color name="color_824fff">#824FFF</color>
</resources> </resources>
\ No newline at end of file
moduleMain/src/main/AndroidManifest.xml
View file @ 73418428
...@@ -127,6 +127,15 @@ ...@@ -127,6 +127,15 @@
android:scheme="hwxg" /> android:scheme="hwxg" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.zxhl.main.page.activity.BlockListActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="blocklist"
android:scheme="hwxg" />
</intent-filter>
</activity>
<activity android:name="com.zxhl.main.page.activity.WinterBoxActivity"> <activity android:name="com.zxhl.main.page.activity.WinterBoxActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
......
moduleMain/src/main/java/com/zxhl/main/page/activity/BlockListActivity.kt 0 → 100644
View file @ 73418428
package com.zxhl.main.page.activity
import android.view.View
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.main.R
import kotlinx.android.synthetic.main.activity_layout_block_list.*
class BlockListActivity : BaseActivity() {
override fun init() {
id_img_back?.setOnClickListener {
finish()
}
}
override fun before() {
super.before()
setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
}
override fun onClick(v: View?) {
}
override fun layoutID(): Int {
return R.layout.activity_layout_block_list
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/adapter/BlockAdapter.kt 0 → 100644
View file @ 73418428
package com.zxhl.main.page.adapter
import android.content.Context
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.RelativeLayout
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
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.BaseRecyclerAdapter
import com.zxhl.cms.net.model.chat.FollowEntity
import com.zxhl.cms.utils.OnRecycleItemClickListener
import com.zxhl.main.R
class BlockAdapter : BaseRecyclerAdapter<FollowEntity, BlockAdapter.ViewHolder> {
private var mContext: Context? = null
private val listener: OnRecycleItemClickListener<FollowEntity>
constructor(
content: Context?,
listener: OnRecycleItemClickListener<FollowEntity>
) : super() {
this.listener = listener
mContext = content
}
override fun onCreateViewHolder(holder: ViewGroup, p1: Int): ViewHolder {
return ViewHolder(
LayoutInflater.from(holder.context).inflate(R.layout.item_layout_fans, holder, false)
)
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val data = mList[position]
holder.id_tv_name.text = data.nickname
if (!TextUtils.isEmpty(data.headImage)) {
Glide.with(AppContext.get()).load(data.headImage)
.apply(RequestOptions.bitmapTransform(CircleCrop()))
.into(holder.id_img_follow)
} else {
holder.id_img_follow.setImageResource(R.drawable.icon_user_photo_default)
}
holder.id_tv_look_time.text="${data.dateStr} 看过你"
if(TextUtils.equals(data.hasFollows,"0")){
holder.id_tv_if_follow.text="关注Ta"
holder.id_tv_if_follow.setBackgroundResource(R.drawable.shape_aa60ff_r3)
holder.id_tv_if_follow.setTextColor(AppContext.get().resources.getColor(R.color.white))
}else{
holder.id_tv_if_follow.text="互相关注"
holder.id_tv_if_follow.setBackgroundResource(R.drawable.shape_999999_r3)
holder.id_tv_if_follow.setTextColor(AppContext.get().resources.getColor(R.color.color_999999))
}
}
inner class ViewHolder : RecyclerView.ViewHolder {
var id_tv_name: TextView
var id_tv_look_time: TextView
var id_tv_if_follow: TextView
var id_img_follow: ImageView
var id_rl_item: RelativeLayout
constructor(itemView: View) : super(itemView) {
id_img_follow = itemView.findViewById(R.id.id_img_follow_head)
id_tv_name = itemView.findViewById(R.id.id_tv_follow_name)
id_tv_look_time = itemView.findViewById(R.id.id_tv_look_time)
id_tv_if_follow = itemView.findViewById(R.id.id_tv_if_follow)
id_rl_item = itemView.findViewById(R.id.id_rl_item)
id_tv_if_follow.setOnClickListener {
val pos = adapterPosition
if (pos >= 0 && pos < mList.size) {
listener.onItemClick(it,pos,mList[pos])
}
}
id_rl_item.setOnClickListener {
val pos = adapterPosition
if (pos >= 0 && pos < mList.size) {
listener.onItemClick(it,pos,mList[pos])
}
}
}
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/adapter/UserAdapter.kt
View file @ 73418428
...@@ -31,7 +31,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -31,7 +31,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
private val listener: OnRecycleItemClickListener<HomeListEntity> private val listener: OnRecycleItemClickListener<HomeListEntity>
private var ifplay: Boolean = false private var ifplay: Boolean = false
private var lastpostion: Int = -1 private var lastpostion: Int = -1
private val HEAD = 1009 //private val HEAD = 1009
private val CONTENT = 1000 private val CONTENT = 1000
public val LOADMORE = 1001 public val LOADMORE = 1001
private val checkStatus: MutableMap<Int, Boolean> = HashMap() private val checkStatus: MutableMap<Int, Boolean> = HashMap()
...@@ -56,38 +56,28 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -56,38 +56,28 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
} }
fun getLoadMore(): Boolean = isLoadMore fun getLoadMore(): Boolean = isLoadMore
override fun getItemCount(): Int {
val size = mList.size + 1
if (size > 0) {
return if (isLoadMore) {
mList.size + 2
} else {
mList.size + 1
}
} else {
return size
}
}
override fun getItemViewType(position: Int): Int { override fun getItemViewType(position: Int): Int {
if (isLoadMore) { if (isLoadMore) {
if (position == mList.size + 1) { if (position == mList.size) {
return LOADMORE return LOADMORE
} else { } else {
if (position == 0) {
return HEAD
}
return CONTENT return CONTENT
} }
} else { } else {
if (position == 0) { return CONTENT
}
}
return HEAD override fun getItemCount(): Int {
val size = mList.size
if (size > 0) {
return if (isLoadMore) {
mList.size + 1
} else {
mList.size
} }
} else {
return CONTENT return size
} }
} }
...@@ -102,31 +92,21 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -102,31 +92,21 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
LayoutInflater.from(mContext).inflate(R.layout.item_load_more, holder, false) LayoutInflater.from(mContext).inflate(R.layout.item_load_more, holder, false)
) )
} else { } else {
if (viewType == HEAD) {
return HomeHeadHolder(
LayoutInflater.from(mContext).inflate(R.layout.item_home_head, holder, false),
)
}else{
return ViewHolder(
LayoutInflater.from(holder.context)
.inflate(R.layout.item_layout_home, holder, false)
)
}
}
} else {
if (viewType == HEAD) {
return HomeHeadHolder(
LayoutInflater.from(mContext).inflate(R.layout.item_home_head, holder, false),
)
}else{
return ViewHolder( return ViewHolder(
LayoutInflater.from(holder.context) LayoutInflater.from(holder.context)
.inflate(R.layout.item_layout_home, holder, false) .inflate(R.layout.item_layout_home, holder, false)
) )
} }
} else {
return ViewHolder(
LayoutInflater.from(holder.context)
.inflate(R.layout.item_layout_home, holder, false)
)
} }
...@@ -187,26 +167,24 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -187,26 +167,24 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
// } // }
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
if (holder is HomeHeadHolder) { if (holder is ViewHolder) {
val data = mList[position]
}else if (holder is ViewHolder) {
val data = mList[position-1]
if (TextUtils.isEmpty(data.voice)) { if (TextUtils.isEmpty(data.voice)) {
holder.id_rl_play_audio.visibility = View.GONE holder.id_rl_play_audio.visibility = View.GONE
} else { } else {
holder.id_rl_play_audio.visibility = View.VISIBLE holder.id_rl_play_audio.visibility = View.VISIBLE
} }
if (TextUtils.equals(data.onlineStatus, "1")) { if (TextUtils.equals(data.onlineStatus, "1")) {
holder.id_img_online.visibility = View.VISIBLE holder.id_img_online.visibility = View.GONE
} else { } else {
holder.id_img_online.visibility = View.GONE holder.id_img_online.visibility = View.GONE
} }
if (TextUtils.isEmpty(data.distance)) { if (TextUtils.isEmpty(data.distance)) {
holder.id_tv_chakan_juli.visibility = View.VISIBLE holder.id_tv_chakan_juli.visibility = View.GONE
holder.id_tv_juli.visibility = View.GONE holder.id_tv_juli.visibility = View.GONE
} else { } else {
holder.id_tv_chakan_juli.visibility = View.GONE holder.id_tv_chakan_juli.visibility = View.GONE
holder.id_tv_juli.visibility = View.VISIBLE holder.id_tv_juli.visibility = View.GONE
// var str: String = String.format("%.2f", distance.toDouble()) // var str: String = String.format("%.2f", distance.toDouble())
holder.id_tv_juli.text = "${data.distance}km" holder.id_tv_juli.text = "${data.distance}km"
} }
...@@ -318,7 +296,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -318,7 +296,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
val pos = adapterPosition val pos = adapterPosition
if (pos >= 0 && pos < mList.size) { if (pos >= 0 && pos < mList.size) {
if (mList[pos].hasLikes.equals("0")) { if (mList[pos].hasLikes.equals("0")) {
listener.onItemClick(v, pos, mList[pos-1]) listener.onItemClick(v, pos, mList[pos])
} else { } else {
playAnimation(id_img_home_like, id_img_heart_gif) playAnimation(id_img_home_like, id_img_heart_gif)
} }
...@@ -332,7 +310,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -332,7 +310,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
val pos = adapterPosition val pos = adapterPosition
Log.e("MXL","pos"+pos) Log.e("MXL","pos"+pos)
if (pos >= 0 && pos < mList.size) { if (pos >= 0 && pos < mList.size) {
listener.onItemClick(v, pos, mList[pos-1]) listener.onItemClick(v, pos, mList[pos])
} }
} }
...@@ -340,14 +318,14 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -340,14 +318,14 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
id_rl_play_audio.setOnClickListener { id_rl_play_audio.setOnClickListener {
val pos = adapterPosition val pos = adapterPosition
if (pos >= 0 && pos < mList.size) { if (pos >= 0 && pos < mList.size) {
listener.onItemClick(it, pos, mList[pos-1]) listener.onItemClick(it, pos, mList[pos])
} }
} }
id_tv_chakan_juli.setOnClickListener(object: NoDoubleClickListener(){ id_tv_chakan_juli.setOnClickListener(object: NoDoubleClickListener(){
override fun onNoDoubleClick(v: View?) { override fun onNoDoubleClick(v: View?) {
val pos = adapterPosition val pos = adapterPosition
if (pos >= 0 && pos < mList.size) { if (pos >= 0 && pos < mList.size) {
listener.onItemClick(v, pos, mList[pos-1]) listener.onItemClick(v, pos, mList[pos])
} }
} }
...@@ -356,25 +334,14 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder> ...@@ -356,25 +334,14 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
override fun onNoDoubleClick(v: View?) { override fun onNoDoubleClick(v: View?) {
val pos = adapterPosition val pos = adapterPosition
if (pos >= 0 && pos < mList.size) { if (pos >= 0 && pos < mList.size) {
listener.onItemClick(v, pos-1, mList[pos-1]) listener.onItemClick(v, pos, mList[pos])
} }
} }
}) })
} }
} }
class HomeHeadHolder : RecyclerView.ViewHolder {
constructor(
itemView: View
) : super(itemView) {
}
}
inner class LoadMoreHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { inner class LoadMoreHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val mImg: ImageView val mImg: ImageView
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/HomeFragment.kt
View file @ 73418428
...@@ -80,15 +80,10 @@ class HomeFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickListen ...@@ -80,15 +80,10 @@ class HomeFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickListen
gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(p0: Int): Int { override fun getSpanSize(p0: Int): Int {
val type = mAdapter?.getItemViewType(p0) val type = mAdapter?.getItemViewType(p0)
if (p0 == 0) { if(type==mAdapter?.LOADMORE){
return gridLayoutManager.spanCount return gridLayoutManager.spanCount
} else { }else{
if(type==mAdapter?.LOADMORE){ return 1
return gridLayoutManager.spanCount
}else{
return 1
}
} }
} }
......
moduleMain/src/main/res/drawable/shape_03c160_rectangle.xml 0 → 100644
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#ff03c160" />
<item android:name="android:shadowColor">#99000000</item>
<item android:name="android:shadowDx">1</item>
<item android:name="android:shadowDy">1</item>
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_50000000_r10.xml 0 → 100644
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#7F000000" />
<corners android:radius="20dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_824fff_r16.xml 0 → 100644
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ff824fff" />
<corners android:radius="16dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_boy_bg.xml 0 → 100644
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ff488fff" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_girl_bg.xml 0 → 100644
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffff3b95" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_block_list.xml 0 → 100644
View file @ 73418428
<?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:background="#F6F6F6"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/id_rl_title"
android:layout_width="match_parent"
android:layout_height="78dp"
android:background="@color/white">
<ImageView
android:id="@+id/id_img_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="15dp"
android:src="@drawable/icon_fanhui_hei" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:includeFontPadding="false"
android:text="Blacklist"
android:textColor="@color/color_333333"
android:textSize="18sp" />
</RelativeLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout>
moduleMain/src/main/res/layout/item_layout_home.xml
View file @ 73418428
...@@ -30,16 +30,39 @@ ...@@ -30,16 +30,39 @@
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11sp" android:textSize="11sp"
android:textStyle="bold" /> android:textStyle="bold"
android:visibility="gone" />
<LinearLayout
android:layout_width="58dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/shape_50000000_r10"
android:gravity="center">
<View
android:layout_width="5dp"
android:layout_height="5dp"
android:layout_marginRight="4dp"
android:background="@drawable/shape_03c160_rectangle" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Online"
android:textColor="#03C160"
android:textSize="12sp" />
</LinearLayout>
<ImageView <ImageView
android:id="@+id/id_img_online" android:id="@+id/id_img_online"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/id_tv_satus" android:layout_alignParentRight="true"
android:layout_marginLeft="5dp" android:src="@drawable/icon_zaixian"
android:layout_marginTop="5dp" android:visibility="gone" />
android:src="@drawable/icon_zaixian" />
<TextView <TextView
android:id="@+id/id_tv_chakan_juli" android:id="@+id/id_tv_chakan_juli"
...@@ -56,7 +79,7 @@ ...@@ -56,7 +79,7 @@
android:text="查看距离" android:text="查看距离"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11sp" android:textSize="11sp"
android:visibility="visible" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/id_tv_juli" android:id="@+id/id_tv_juli"
...@@ -87,19 +110,50 @@ ...@@ -87,19 +110,50 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="11.5dp"> android:paddingBottom="11.5dp">
<TextView <LinearLayout
android:id="@+id/id_tv_user_nick_name" android:layout_width="wrap_content"
android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:gravity="center_vertical">
android:ellipsize="end"
android:maxLength="10" <TextView
android:shadowColor="#99000000" android:id="@+id/id_tv_user_nick_name"
android:shadowDx="1.0" android:layout_width="wrap_content"
android:shadowDy="1.0" android:layout_height="wrap_content"
android:shadowRadius="3.0" android:layout_marginLeft="5dp"
android:textColor="@color/white" android:ellipsize="end"
android:textSize="11sp" /> android:includeFontPadding="false"
android:lines="1"
android:maxWidth="65dp"
android:maxLength="10"
android:shadowColor="#99000000"
android:shadowDx="1.0"
android:shadowDy="1.0"
android:shadowRadius="3.0"
android:textColor="@color/white"
android:textSize="13sp" />
<LinearLayout
android:layout_width="36dp"
android:layout_height="16dp"
android:layout_marginLeft="5dp"
android:background="@drawable/shape_girl_bg"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/id_tv_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/icon_little_nv"
android:drawablePadding="3dp"
android:includeFontPadding="false"
android:text="0"
android:textColor="@color/white"
android:textSize="11sp" />
</LinearLayout>
</LinearLayout>
<RelativeLayout <RelativeLayout
...@@ -109,7 +163,7 @@ ...@@ -109,7 +163,7 @@
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@drawable/shape_000000_r5" android:background="@drawable/shape_000000_r5"
android:visibility="visible"> android:visibility="gone">
<ImageView <ImageView
android:id="@+id/id_img_voice" android:id="@+id/id_img_voice"
...@@ -150,8 +204,17 @@ ...@@ -150,8 +204,17 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_above="@+id/id_ll_bottom_right" android:layout_above="@+id/id_ll_bottom_right"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginBottom="-10dp" android:layout_marginRight="18dp"
android:layout_marginRight="18dp" /> android:layout_marginBottom="-10dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:src="@drawable/icon_shipin" />
<LinearLayout <LinearLayout
android:id="@+id/id_ll_bottom_right" android:id="@+id/id_ll_bottom_right"
...@@ -162,7 +225,8 @@ ...@@ -162,7 +225,8 @@
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp"> android:padding="5dp"
android:visibility="gone">
<ImageView <ImageView
android:id="@+id/id_img_home_like" android:id="@+id/id_img_home_like"
......
moduleMain/src/main/res/layout/layout_item_block_list.xml 0 → 100644
View file @ 73418428
<?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="wrap_content"
android:layout_margin="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/item_head" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
android:text="Mike"
android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_824fff_r16"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="Remove Blacklist"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
moduleUc/src/main/java/com/zxhl/uc/page/fragment/SettingActivity.kt
View file @ 73418428
...@@ -36,11 +36,14 @@ class SettingActivity : BaseActivity(), UpdateCallback { ...@@ -36,11 +36,14 @@ class SettingActivity : BaseActivity(), UpdateCallback {
id_img_back?.setOnClickListener { id_img_back?.setOnClickListener {
finish() finish()
} }
id_rl_black_list?.setOnClickListener {
JumpUtils.BlockListJump()
}
id_rl_yinsizhengce?.setOnClickListener { id_rl_yinsizhengce?.setOnClickListener {
JumpUtils.webJump("隐私政策", NetConfig.H5.WEB_URL_PRIVACY) JumpUtils.webJump("Privacy policy", NetConfig.H5.WEB_URL_PRIVACY)
} }
id_rl_yonghu_xieyi?.setOnClickListener { id_rl_yonghu_xieyi?.setOnClickListener {
JumpUtils.webJump("用户服务协议", NetConfig.H5.WEB_URL_USER) JumpUtils.webJump("Terms of service", NetConfig.H5.WEB_URL_USER)
} }
id_rl_zenzhi_xieyi?.setOnClickListener { id_rl_zenzhi_xieyi?.setOnClickListener {
JumpUtils.webJump("增值服务协议", NetConfig.H5.WEB_URL_BUYER_KNOW) JumpUtils.webJump("增值服务协议", NetConfig.H5.WEB_URL_BUYER_KNOW)
......
moduleUc/src/main/java/com/zxhl/uc/page/fragment/UserCenterFragment.kt
View file @ 73418428
...@@ -58,15 +58,6 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>, ...@@ -58,15 +58,6 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
private var iwHelper: ImageWatcherHelper? = null private var iwHelper: ImageWatcherHelper? = null
var isTranslucentStatus = false var isTranslucentStatus = false
override fun init(view: View?) { override fun init(view: View?) {
if (TextUtils.equals(
Utils.getChannel(mActivity),
"vivo"
)
) {
id_rl_zaixiankefu.visibility=View.VISIBLE
}else{
id_rl_zaixiankefu.visibility=View.GONE
}
mLoading = LoadingDialog.getLoadingDialog( mLoading = LoadingDialog.getLoadingDialog(
mActivity, mActivity,
getString(com.zxhl.cms.R.string.wait_ing), getString(com.zxhl.cms.R.string.wait_ing),
...@@ -129,7 +120,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>, ...@@ -129,7 +120,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
JumpUtils.UserInfoJump() JumpUtils.UserInfoJump()
} }
id_rl_zaixiankefu?.setOnClickListener { id_rl_zaixiankefu?.setOnClickListener {
JumpUtils.webJump("在线客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE) JumpUtils.webJump("Customer Service", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
} }
id_ll_my_follow?.setOnClickListener { id_ll_my_follow?.setOnClickListener {
JumpUtils.MyFollowJump() JumpUtils.MyFollowJump()
...@@ -141,14 +132,14 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>, ...@@ -141,14 +132,14 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
EventUtils.onEvent("CheckLikedMe", "查看喜欢我") EventUtils.onEvent("CheckLikedMe", "查看喜欢我")
JumpUtils.MyLikesJump() JumpUtils.MyLikesJump()
} }
id_rl_jiyijan?.setOnClickListener { // id_rl_jiyijan?.setOnClickListener {
JumpUtils.FeedBackJump() // JumpUtils.FeedBackJump()
} // }
id_rl_setting?.setOnClickListener { id_rl_setting?.setOnClickListener {
JumpUtils.SettingJump() JumpUtils.SettingJump()
} }
id_rl_about_us?.setOnClickListener { id_rl_about_us?.setOnClickListener {
JumpUtils.webJump("关于我们", NetConfig.H5.WEB_URL_ABOUT_US) JumpUtils.webJump("About us", NetConfig.H5.WEB_URL_ABOUT_US)
} }
...@@ -201,28 +192,34 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>, ...@@ -201,28 +192,34 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
if (user == null) { if (user == null) {
return return
} }
id_tv_yu_e_trip?.text = "${user.starBalance}"
if (user.memberType == 0) { if (user.memberType == 0) {
id_tv_vip_trip?.text = "立即升级" id_tv_member_date.visibility = View.GONE
id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white)) id_tv_privileage?.visibility = View.VISIBLE
id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffa211_r15_stoke) id_tv_member?.text = "Open VIP to unlock"
} else { id_tv_privileage?.text = "privilege"
id_tv_vip_trip?.text = "立即续费" // id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffa211)) // id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffa211_r15_stoke)
id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffffff_ffa211_r15)
}
if (user.noRecharged) {
//未充值过
id_tv_yu_e_trip?.text = "充值星币获取超多玩法"
id_tv_coin_trip?.text = "立即充值"
id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffc217_r15)
} else { } else {
id_tv_yu_e_trip?.text = "星币余额：${user.starBalance}" id_tv_member_date.visibility = View.VISIBLE
id_tv_coin_trip?.text = "继续充值" id_tv_privileage?.visibility = View.GONE
id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffc217)) id_tv_member?.text = "VIP Expiration Date"
id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffffff_ffc217_r15) 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)
} }
// if (user.noRecharged) {
// //未充值过
// id_tv_yu_e_trip?.text = "充值星币获取超多玩法"
// id_tv_coin_trip?.text = "立即充值"
// id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
// id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffc217_r15)
// } else {
// id_tv_yu_e_trip?.text = "星币余额：${user.starBalance}"
// id_tv_coin_trip?.text = "继续充值"
// id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffc217))
// id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffffff_ffc217_r15)
// }
id_fragment_user_center_name?.text = user.nickname id_fragment_user_center_name?.text = user.nickname
id_fragment_user_center_id?.text = "ID:" + user.uid id_fragment_user_center_id?.text = "ID:" + user.uid
if (!TextUtils.isEmpty(user.headImage)) { if (!TextUtils.isEmpty(user.headImage)) {
......
moduleUc/src/main/res/drawable/shape_bd8aff_662cf5_r15.xml 0 → 100644
View file @ 73418428
<?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="15dp" />
</shape>
\ No newline at end of file
moduleUc/src/main/res/drawable/shape_f4ebff_f5edff.xml 0 → 100644
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="135"
android:centerColor="#fff5edff"
android:endColor="#ffeef4ff"
android:startColor="#fff4ebff"
android:type="linear"
android:useLevel="true" />
</shape>
\ No newline at end of file
moduleUc/src/main/res/drawable/shape_ffffff_r5.xml
View file @ 73418428
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffffff" /> <solid android:color="#ffffffff" />
<corners android:radius="5dp" /> <corners android:radius="10dp" />
</shape> </shape>
\ No newline at end of file
moduleUc/src/main/res/layout/activity_layout_setting.xml
View file @ 73418428
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="设置" android:text="Settings"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:text="隐私政策" android:text="Privacy policy"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="15sp" /> android:textSize="15sp" />
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_tuijin" /> android:src="@drawable/icon_user_center_right"
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
<View <View
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:text="用户服务协议" android:text="Terms of service"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="15sp" /> android:textSize="15sp" />
...@@ -90,7 +91,8 @@ ...@@ -90,7 +91,8 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_tuijin" /> android:src="@drawable/icon_user_center_right"
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
<View <View
...@@ -103,7 +105,8 @@ ...@@ -103,7 +105,8 @@
<RelativeLayout <RelativeLayout
android:id="@+id/id_rl_zenzhi_xieyi" android:id="@+id/id_rl_zenzhi_xieyi"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp"> android:layout_height="48dp"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -121,7 +124,7 @@ ...@@ -121,7 +124,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_tuijin" /> android:src="@drawable/icon_user_center_right" />
</RelativeLayout> </RelativeLayout>
<View <View
...@@ -134,7 +137,8 @@ ...@@ -134,7 +137,8 @@
<RelativeLayout <RelativeLayout
android:id="@+id/id_rl_update" android:id="@+id/id_rl_update"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp"> android:layout_height="48dp"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -152,7 +156,7 @@ ...@@ -152,7 +156,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_tuijin" /> android:src="@drawable/icon_user_center_right" />
</RelativeLayout> </RelativeLayout>
<View <View
...@@ -165,7 +169,8 @@ ...@@ -165,7 +169,8 @@
<RelativeLayout <RelativeLayout
android:id="@+id/id_rl_about_us" android:id="@+id/id_rl_about_us"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp"> android:layout_height="48dp"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -183,12 +188,13 @@ ...@@ -183,12 +188,13 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_tuijin" /> android:src="@drawable/icon_user_center_right" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/id_rl_account_out" android:id="@+id/id_rl_account_out"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp"> android:layout_height="48dp"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -206,16 +212,40 @@ ...@@ -206,16 +212,40 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_tuijin" /> android:src="@drawable/icon_user_center_right" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/id_rl_black_list"
android:layout_width="match_parent"
android:layout_height="48dp"
android:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:drawablePadding="10dp"
android:text="Blacklist"
android:textColor="@color/color_333333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/icon_user_center_right"
android:visibility="gone"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/id_ll_login_out" android:id="@+id/id_ll_login_out"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/shape_ffffff_r5_shadow_color" android:background="@drawable/shape_ffffff_r5"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
...@@ -225,8 +255,8 @@ ...@@ -225,8 +255,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="退出登录" android:text="Logout"
android:textColor="@color/color_333333" android:textColor="@color/color_824fff"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold"/> android:textStyle="bold"/>
......
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