Skip to content

A
android_vediosocial
Commit faf6db49 authored by jyx's avatar jyx
Browse files
Options

添加UI图片

parent 7ac6ad33
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 882 additions and 1350 deletions
TUIKit/TUIConversation/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIConversationFragment.java
View file @ faf6db49
...@@ -55,6 +55,12 @@ public class TUIConversationFragment extends Fragment { ...@@ -55,6 +55,12 @@ public class TUIConversationFragment extends Fragment {
private ConversationPresenter presenter; private ConversationPresenter presenter;
// private ChatAc
protected void setChatActivity() {
}
@Nullable @Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
...@@ -76,7 +82,7 @@ public class TUIConversationFragment extends Fragment { ...@@ -76,7 +82,7 @@ public class TUIConversationFragment extends Fragment {
} }
private void initView() { private void initView() {
mConversationLayout = mBaseView.findViewById(R.id.conversation_layout); mConversationLayout = mBaseView.findViewById(R.id.conversation_layout);
presenter = new ConversationPresenter(); presenter = new ConversationPresenter();
...@@ -89,7 +95,7 @@ public class TUIConversationFragment extends Fragment { ...@@ -89,7 +95,7 @@ public class TUIConversationFragment extends Fragment {
mConversationLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() { mConversationLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
@Override @Override
public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) { public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
if (conversationInfo.isMarkFold()) { if (conversationInfo.isMarkFold()) {
mConversationLayout.clearUnreadStatusOfFoldItem(); mConversationLayout.clearUnreadStatusOfFoldItem();
startFoldedConversationActivity(); startFoldedConversationActivity();
...@@ -122,7 +128,7 @@ public class TUIConversationFragment extends Fragment { ...@@ -122,7 +128,7 @@ public class TUIConversationFragment extends Fragment {
if (mConversationLayout.getConversationList().getAdapter() != null && mConversationLayout.getConversationList().getAdapter().isClick()) { if (mConversationLayout.getConversationList().getAdapter() != null && mConversationLayout.getConversationList().getAdapter().isClick()) {
mConversationLayout.getConversationList().getAdapter().setClick(false); mConversationLayout.getConversationList().getAdapter().setClick(false);
mConversationLayout.getConversationList().getAdapter().notifyItemChanged( mConversationLayout.getConversationList().getAdapter().notifyItemChanged(
mConversationLayout.getConversationList().getAdapter().getCurrentPosition()); mConversationLayout.getConversationList().getAdapter().getCurrentPosition());
} }
} }
...@@ -149,23 +155,24 @@ public class TUIConversationFragment extends Fragment { ...@@ -149,23 +155,24 @@ public class TUIConversationFragment extends Fragment {
@Override @Override
public void onActionClick(int index, Object data) { public void onActionClick(int index, Object data) {
TUIKitDialog tipsDialog = TUIKitDialog tipsDialog =
new TUIKitDialog(getContext()) new TUIKitDialog(getContext())
.builder() .builder()
.setCancelable(true) .setCancelable(true)
.setCancelOutside(true) .setCancelOutside(true)
.setTitle(getContext().getString(R.string.conversation_delete_tips)) .setTitle(getContext().getString(R.string.conversation_delete_tips))
.setDialogWidth(0.75f) .setDialogWidth(0.75f)
.setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure),
new View.OnClickListener() { new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mConversationLayout.deleteConversation((ConversationInfo) data); mConversationLayout.deleteConversation((ConversationInfo) data);
} }
}) })
.setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() { .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
@Override @Override
public void onClick(View v) {} public void onClick(View v) {
}); }
});
tipsDialog.show(); tipsDialog.show();
} }
}); });
......
TUIKit/TUICore/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java
View file @ faf6db49
...@@ -133,7 +133,8 @@ public final class TUIConstants { ...@@ -133,7 +133,8 @@ public final class TUIConstants {
public static final String EVENT_SUB_KEY_MESSAGE_BOTTOM_CHANGED = "eventSubKeyMessageBottomChanged"; public static final String EVENT_SUB_KEY_MESSAGE_BOTTOM_CHANGED = "eventSubKeyMessageBottomChanged";
public static final String EVENT_SUB_KEY_MESSAGE_INFO_CHANGED = "eventSubKeyMessageInfoChanged"; public static final String EVENT_SUB_KEY_MESSAGE_INFO_CHANGED = "eventSubKeyMessageInfoChanged";
public static final String C2C_CHAT_ACTIVITY_NAME = "TUIC2CChatActivity"; // public static final String C2C_CHAT_ACTIVITY_NAME = "TUIC2CChatActivity";
public static final String C2C_CHAT_ACTIVITY_NAME = "IMActivity";
public static final String GROUP_CHAT_ACTIVITY_NAME = "TUIGroupChatActivity"; public static final String GROUP_CHAT_ACTIVITY_NAME = "TUIGroupChatActivity";
public static final String CHAT_ID = "chatId"; public static final String CHAT_ID = "chatId";
......
video/app/src/main/java/com/duben/library/base/BaseAppCompatActivity.java
View file @ faf6db49
...@@ -290,16 +290,16 @@ public abstract class BaseAppCompatActivity extends TransitionActivity { ...@@ -290,16 +290,16 @@ public abstract class BaseAppCompatActivity extends TransitionActivity {
* @param tintDrawable * @param tintDrawable
*/ */
protected void setSystemBarTintDrawable(Drawable tintDrawable) { protected void setSystemBarTintDrawable(Drawable tintDrawable) {
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
// SystemBarTintManager mTintManager = new SystemBarTintManager(this); SystemBarTintManager mTintManager = new SystemBarTintManager(this);
// if (tintDrawable != null) { if (tintDrawable != null) {
// mTintManager.setStatusBarTintEnabled(true); mTintManager.setStatusBarTintEnabled(true);
// mTintManager.setTintDrawable(tintDrawable); mTintManager.setTintDrawable(tintDrawable);
// } else { } else {
// mTintManager.setStatusBarTintEnabled(false); mTintManager.setStatusBarTintEnabled(false);
// mTintManager.setTintDrawable(null); mTintManager.setTintDrawable(null);
// } }
// } }
} }
/** /**
...@@ -308,16 +308,16 @@ public abstract class BaseAppCompatActivity extends TransitionActivity { ...@@ -308,16 +308,16 @@ public abstract class BaseAppCompatActivity extends TransitionActivity {
* @param on * @param on
*/ */
protected void setTranslucentStatus(boolean on) { protected void setTranslucentStatus(boolean on) {
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
// Window win = getWindow(); Window win = getWindow();
// WindowManager.LayoutParams winParams = win.getAttributes(); WindowManager.LayoutParams winParams = win.getAttributes();
// final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
// if (on) { if (on) {
// winParams.flags |= bits; winParams.flags |= bits;
// } else { } else {
// winParams.flags &= ~bits; winParams.flags &= ~bits;
// } }
// win.setAttributes(winParams); win.setAttributes(winParams);
// } }
} }
} }
video/app/src/main/java/com/duben/library/utils/GlideUtils.kt
View file @ faf6db49
...@@ -233,4 +233,13 @@ object GlideUtils { ...@@ -233,4 +233,13 @@ object GlideUtils {
fun loadThumbImageView(context: Context, path: String?, mImageView: ImageView) { fun loadThumbImageView(context: Context, path: String?, mImageView: ImageView) {
Glide.with(context).load("$path?x-oss-process=image/resize,p_20").into(mImageView) Glide.with(context).load("$path?x-oss-process=image/resize,p_20").into(mImageView)
} }
//默认加载
fun loadThumbRoundImageView(mContext: Context, path: String?, mImageView: ImageView) {
Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20").apply(
RequestOptions().transform(
CenterCrop(), RoundedCorners(BubbleUtils.dp2px(10))
)
).dontAnimate().into(mImageView)
}
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/MintsApplication.java
View file @ faf6db49
...@@ -20,6 +20,7 @@ import com.duben.roseplaylet.net.V6Service; ...@@ -20,6 +20,7 @@ import com.duben.roseplaylet.net.V6Service;
import com.duben.roseplaylet.utils.AppPreferencesManager; import com.duben.roseplaylet.utils.AppPreferencesManager;
import com.duben.roseplaylet.utils.ForegroundOrBackground; import com.duben.roseplaylet.utils.ForegroundOrBackground;
import com.duben.oaid.MiitHelper; import com.duben.oaid.MiitHelper;
import com.mob.MobSDK;
import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.AndroidLogAdapter;
import com.orhanobut.logger.FormatStrategy; import com.orhanobut.logger.FormatStrategy;
import com.orhanobut.logger.Logger; import com.orhanobut.logger.Logger;
...@@ -96,6 +97,9 @@ public class MintsApplication extends MultiDexApplication { ...@@ -96,6 +97,9 @@ public class MintsApplication extends MultiDexApplication {
// bugly // bugly
CrashReport.initCrashReport(this, "d035276c5b", BuildConfig.DEBUG); CrashReport.initCrashReport(this, "d035276c5b", BuildConfig.DEBUG);
//Mob隐私授权接口
MobSDK.submitPolicyGrantResult(true);
} }
/** /**
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/FirstPresenter.kt
View file @ faf6db49
...@@ -12,6 +12,7 @@ import com.duben.roseplaylet.utils.DeviceUuidFactory ...@@ -12,6 +12,7 @@ import com.duben.roseplaylet.utils.DeviceUuidFactory
import com.duben.library.net.neterror.BaseSubscriber import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable import com.duben.library.net.neterror.Throwable
import com.duben.roseplaylet.common.AppConfig import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.manager.IMHelper
import com.duben.roseplaylet.mvp.views.FirstView import com.duben.roseplaylet.mvp.views.FirstView
import com.google.gson.JsonObject import com.google.gson.JsonObject
import java.util.HashMap import java.util.HashMap
...@@ -22,36 +23,37 @@ class FirstPresenter : BasePresenter<FirstView>() { ...@@ -22,36 +23,37 @@ class FirstPresenter : BasePresenter<FirstView>() {
* 游客登录 * 游客登录
*/ */
fun userLogin() { fun userLogin() {
// val vo = HashMap<String, Any>() val vo = HashMap<String, Any>()
// vo["device"] = DeviceUuidFactory().deviceUuid.toString() vo["device"] = DeviceUuidFactory().deviceUuid.toString()
// AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
// .call(loanService.visitorlogin(vo), .call(loanService.visitorlogin(vo),
// object : BaseSubscriber<BaseResponse<UserBean>>() { object : BaseSubscriber<BaseResponse<UserBean>>() {
// override fun onCompleted() { override fun onCompleted() {
// if (isLinkView) return if (isLinkView) return
// } }
//
// override fun onError(e: Throwable) { override fun onError(e: Throwable) {
// if (isLinkView) return if (isLinkView) return
// } }
//
// override fun onNext(baseResponse: BaseResponse<UserBean>) { override fun onNext(baseResponse: BaseResponse<UserBean>) {
// if (isLinkView) return if (isLinkView) return
// view.hideLoading() view.hideLoading()
// val code = baseResponse.getStatus() val code = baseResponse.getStatus()
// val message = baseResponse.getMessage() val message = baseResponse.getMessage()
// val data: UserBean? = baseResponse.getData() val data: UserBean? = baseResponse.getData()
// when (code) { when (code) {
// 200 -> if (data != null) { 200 -> if (data != null) {
// UserManager.getInstance().saveUserInfo(data) UserManager.getInstance().saveUserInfo(data)
// saveTerminalInfo() saveTerminalInfo()
// } IMHelper.instance.getImMsg()
// else -> { }
// view.showToast(message) else -> {
// } view.showToast(message)
// } }
// } }
// }) }
})
} }
/** /**
...@@ -60,40 +62,39 @@ class FirstPresenter : BasePresenter<FirstView>() { ...@@ -60,40 +62,39 @@ class FirstPresenter : BasePresenter<FirstView>() {
* @param context * @param context
*/ */
fun saveTerminalInfo() { fun saveTerminalInfo() {
// val vo = HashMap<String, Any>() val vo = HashMap<String, Any>()
// val deviceInfo: DeviceInfo = DeviceInfo.instance val deviceInfo: DeviceInfo = DeviceInfo.instance
// val macAddress: String = deviceInfo.getMacAddress() val macAddress: String = deviceInfo.getMacAddress()
// val mac = macAddress.replace(":", "") val mac = macAddress.replace(":", "")
// vo["mac"] = mac vo["mac"] = mac
// vo["mac1"] = macAddress vo["mac1"] = macAddress
// vo["androidid"] = deviceInfo.getAndroidId(null) vo["androidid"] = deviceInfo.getAndroidId(null)
// vo["imei"] = deviceInfo.iMEI vo["imei"] = deviceInfo.iMEI
// vo["oaid"] = MintsApplication.OAID vo["oaid"] = MintsApplication.OAID
// vo["os"] = if (deviceInfo.isHarmonyOS()) "android-HarmonyOS" else "android" vo["os"] = if (deviceInfo.isHarmonyOS()) "android-HarmonyOS" else "android"
// vo["model"] = deviceInfo.newModel vo["model"] = deviceInfo.newModel
// vo["uuid"] = DeviceUuidFactory().deviceUuid vo["uuid"] = DeviceUuidFactory().deviceUuid
// vo["osversion"] = deviceInfo.oSVersion vo["osversion"] = deviceInfo.oSVersion
// vo["appversion"] = deviceInfo.versionName vo["appversion"] = deviceInfo.versionName
// AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
// .call(loanService.saveTerminalInfo(vo), .call(loanService.saveTerminalInfo(vo),
// object : BaseSubscriber<BaseResponse<Any>>() { object : BaseSubscriber<BaseResponse<Any>>() {
// override fun onCompleted() { override fun onCompleted() {
// if (isLinkView) return if (isLinkView) return
// } }
//
// override fun onError(e: Throwable) {
// if (isLinkView) return
// }
//
// override fun onNext(baseResponse: BaseResponse<Any>) {
// if (isLinkView) return
// val code = baseResponse.status
// when (code) {
// 200 -> {
// }
// }
// }
// })
}
override fun onError(e: Throwable) {
if (isLinkView) return
}
override fun onNext(baseResponse: BaseResponse<Any>) {
if (isLinkView) return
val code = baseResponse.status
when (code) {
200 -> {
}
}
}
})
}
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/RealAuthPresenter.kt
View file @ faf6db49
...@@ -80,9 +80,10 @@ class RealAuthPresenter : BasePresenter<RealAuthView>() { ...@@ -80,9 +80,10 @@ class RealAuthPresenter : BasePresenter<RealAuthView>() {
}) })
} }
fun setWechatQRCode(qrCode: String) { fun setWechatQRCode(qrCode: String, infoWechat: String) {
val vo = hashMapOf<String, Any>() val vo = hashMapOf<String, Any>()
vo["qrCode"] = qrCode vo["qrCode"] = qrCode
vo["infoWechat"] = infoWechat
AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
.call(loanService.setWechatQRCode(vo), .call(loanService.setWechatQRCode(vo),
object : BaseSubscriber<BaseResponse<FaceParam>>() { object : BaseSubscriber<BaseResponse<FaceParam>>() {
...@@ -99,9 +100,10 @@ class RealAuthPresenter : BasePresenter<RealAuthView>() { ...@@ -99,9 +100,10 @@ class RealAuthPresenter : BasePresenter<RealAuthView>() {
val message = baseResponse.message val message = baseResponse.message
when (code) { when (code) {
200 -> {} 200 -> view.setWechatQRCodeSuc()
else -> { else -> {
view.showToast(message) view.showToast(message)
view.setWechatQRCodeFail()
} }
} }
} }
...@@ -110,6 +112,7 @@ class RealAuthPresenter : BasePresenter<RealAuthView>() { ...@@ -110,6 +112,7 @@ class RealAuthPresenter : BasePresenter<RealAuthView>() {
if (isLinkView) return if (isLinkView) return
view.hideLoading() view.hideLoading()
view.showToast(e?.message) view.showToast(e?.message)
view.setWechatQRCodeFail()
} }
}) })
} }
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/TrackPresenter.java
View file @ faf6db49
...@@ -9,6 +9,7 @@ import com.duben.roseplaylet.MintsApplication; ...@@ -9,6 +9,7 @@ import com.duben.roseplaylet.MintsApplication;
import com.duben.roseplaylet.common.AppConfig; import com.duben.roseplaylet.common.AppConfig;
import com.duben.roseplaylet.common.DeviceInfo; import com.duben.roseplaylet.common.DeviceInfo;
import com.duben.roseplaylet.manager.AppHttpManager; import com.duben.roseplaylet.manager.AppHttpManager;
import com.duben.roseplaylet.manager.IMHelper;
import com.duben.roseplaylet.manager.UserManager; import com.duben.roseplaylet.manager.UserManager;
import com.duben.roseplaylet.mvp.model.BaseResponse; import com.duben.roseplaylet.mvp.model.BaseResponse;
import com.duben.roseplaylet.mvp.model.UserBean; import com.duben.roseplaylet.mvp.model.UserBean;
...@@ -68,6 +69,7 @@ public class TrackPresenter extends BaseTrackPresenter { ...@@ -68,6 +69,7 @@ public class TrackPresenter extends BaseTrackPresenter {
switch (baseResponse.getStatus()) { switch (baseResponse.getStatus()) {
case 200: { case 200: {
UserManager.getInstance().saveUserInfo(baseResponse.getData()); UserManager.getInstance().saveUserInfo(baseResponse.getData());
IMHelper.Companion.getInstance().getImMsg();
} }
} }
} }
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/UserProfilePresenter.kt
View file @ faf6db49
...@@ -265,4 +265,37 @@ class UserProfilePresenter : BasePresenter<UserProfileView>() { ...@@ -265,4 +265,37 @@ class UserProfilePresenter : BasePresenter<UserProfileView>() {
} }
}) })
} }
fun getShareUrl() {
AppHttpManager.getInstance(loanApplication)
.call(loanService.shareUrl,
object : BaseSubscriber<BaseResponse<JsonObject>>() {
override fun onCompleted() {
if (isLinkView) return
}
override fun onError(e: Throwable) {
if (isLinkView) return
view.showToast(e.message)
view.getShareUrlSucFail()
}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
if (isLinkView) return
val code = baseResponse.status
val message = baseResponse.message
when (code) {
200 -> {
view.getShareUrlSuc(baseResponse.data.get("url").asString)
}
else -> {
view.showToast(message)
view.getShareUrlSucFail()
}
}
}
})
}
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/VipEnjoyPresenter.kt
View file @ faf6db49
...@@ -7,7 +7,6 @@ import com.duben.roseplaylet.mvp.model.BannerList ...@@ -7,7 +7,6 @@ import com.duben.roseplaylet.mvp.model.BannerList
import com.duben.roseplaylet.mvp.model.BaseResponse import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.views.VipEnjoyView import com.duben.roseplaylet.mvp.views.VipEnjoyView
/** /**
* @author Assen * @author Assen
* @date 2023/12/5 * @date 2023/12/5
...@@ -15,12 +14,39 @@ import com.duben.roseplaylet.mvp.views.VipEnjoyView ...@@ -15,12 +14,39 @@ import com.duben.roseplaylet.mvp.views.VipEnjoyView
*/ */
class VipEnjoyPresenter : BasePresenter<VipEnjoyView>() { class VipEnjoyPresenter : BasePresenter<VipEnjoyView>() {
fun getVedio4List(page: Int, pageCount: Int) { fun topTabs() {
val vo = hashMapOf<String, Any>() AppHttpManager.getInstance(loanApplication)
vo["page"] = page .call(loanService.topTabs(),
vo["size"] = pageCount object : BaseSubscriber<BaseResponse<BannerList>>() {
override fun onCompleted() {
if (isLinkView) return
}
override fun onError(e: Throwable) {
if (isLinkView) return
}
override fun onNext(baseResponse: BaseResponse<BannerList>) {
if (isLinkView) return
val code = baseResponse.status
val message = baseResponse.message
when (code) {
200 -> {
view.topTabsSuc(baseResponse.data)
}
else -> {
view.showToast(message)
}
}
}
})
}
fun orders() {
AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
.call(loanService.vedio4List(vo), .call(loanService.orders(),
object : BaseSubscriber<BaseResponse<BannerList>>() { object : BaseSubscriber<BaseResponse<BannerList>>() {
override fun onCompleted() { override fun onCompleted() {
if (isLinkView) return if (isLinkView) return
...@@ -28,8 +54,6 @@ class VipEnjoyPresenter : BasePresenter<VipEnjoyView>() { ...@@ -28,8 +54,6 @@ class VipEnjoyPresenter : BasePresenter<VipEnjoyView>() {
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
if (isLinkView) return if (isLinkView) return
view.showToast(e.message)
view.getVedio4ListFail()
} }
override fun onNext(baseResponse: BaseResponse<BannerList>) { override fun onNext(baseResponse: BaseResponse<BannerList>) {
...@@ -40,11 +64,10 @@ class VipEnjoyPresenter : BasePresenter<VipEnjoyView>() { ...@@ -40,11 +64,10 @@ class VipEnjoyPresenter : BasePresenter<VipEnjoyView>() {
when (code) { when (code) {
200 -> { 200 -> {
view.getVedio4ListSuc(baseResponse.data) view.ordersSuc(baseResponse.data)
} }
else -> { else -> {
view.showToast(message) view.showToast(message)
view.getVedio4ListFail()
} }
} }
} }
......
video/app/src/main/java/com/duben/roseplaylet/mvp/views/RealAuthView.kt
View file @ faf6db49
...@@ -15,5 +15,6 @@ interface RealAuthView : BaseView { ...@@ -15,5 +15,6 @@ interface RealAuthView : BaseView {
fun getUserInfoFail() fun getUserInfoFail()
fun setUserInfoSuc() fun setUserInfoSuc()
fun setUserInfoFail() fun setUserInfoFail()
fun setWechatQRCodeSuc()
fun setWechatQRCodeFail()
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/views/UserProfileView.kt
View file @ faf6db49
...@@ -19,6 +19,8 @@ interface UserProfileView : BaseView { ...@@ -19,6 +19,8 @@ interface UserProfileView : BaseView {
fun toWhiteSuc() fun toWhiteSuc()
fun toBlackSuc() fun toBlackSuc()
fun toLikeSuc(status: Int) fun toLikeSuc(status: Int)
fun getShareUrlSuc(data: String)
fun getShareUrlSucFail()
} }
video/app/src/main/java/com/duben/roseplaylet/mvp/views/VipEnjoyView.kt
View file @ faf6db49
...@@ -3,6 +3,6 @@ package com.duben.roseplaylet.mvp.views ...@@ -3,6 +3,6 @@ package com.duben.roseplaylet.mvp.views
import com.duben.roseplaylet.mvp.model.BannerList import com.duben.roseplaylet.mvp.model.BannerList
interface VipEnjoyView : BaseView { interface VipEnjoyView : BaseView {
fun getVedio4ListSuc(bannerList: BannerList) fun topTabsSuc(data: BannerList?)
fun getVedio4ListFail() fun ordersSuc(data: BannerList?)
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/AboutUsActivity.kt
View file @ faf6db49
...@@ -3,7 +3,6 @@ package com.duben.roseplaylet.ui.activitys ...@@ -3,7 +3,6 @@ package com.duben.roseplaylet.ui.activitys
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.widget.TextView
import com.bytedance.hume.readapk.HumeSDK import com.bytedance.hume.readapk.HumeSDK
import com.duben.roseplaylet.BuildConfig import com.duben.roseplaylet.BuildConfig
import com.duben.roseplaylet.MintsApplication import com.duben.roseplaylet.MintsApplication
...@@ -33,8 +32,6 @@ class AboutUsActivity : BaseActivity(), View.OnClickListener { ...@@ -33,8 +32,6 @@ class AboutUsActivity : BaseActivity(), View.OnClickListener {
tvAboutasVersion.text = tvAboutasVersion.text =
getString(R.string.app_name) + " v" + ConstantUtil.getVersionName(context) getString(R.string.app_name) + " v" + ConstantUtil.getVersionName(context)
tv_title.text = if (BuildConfig.DEBUG) "测试-关于我们" else "关于我们" tv_title.text = if (BuildConfig.DEBUG) "测试-关于我们" else "关于我们"
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
ivAboutasIcon.setOnLongClickListener { ivAboutasIcon.setOnLongClickListener {
ToastUtil.showLong( ToastUtil.showLong(
...@@ -78,12 +75,5 @@ class AboutUsActivity : BaseActivity(), View.OnClickListener { ...@@ -78,12 +75,5 @@ class AboutUsActivity : BaseActivity(), View.OnClickListener {
iv_left_icon.setOnClickListener(this) iv_left_icon.setOnClickListener(this)
tvAboutasService.setOnClickListener(this) tvAboutasService.setOnClickListener(this)
tvAboutasPolicy.setOnClickListener(this) tvAboutasPolicy.setOnClickListener(this)
findViewById<TextView>(R.id.tv_about_address).setOnLongClickListener {
return@setOnLongClickListener true
}
} }
} }
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/BasicUserProfileActivity.kt
View file @ faf6db49
...@@ -108,7 +108,7 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser ...@@ -108,7 +108,7 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
showToast("请输入年龄！") showToast("请输入年龄！")
return return
} }
if (sex == 1 || sex == 2) { if (sex != 1 || sex != 2) {
showToast("请选择性别！") showToast("请选择性别！")
return return
} }
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/ShareActivity.kt
View file @ faf6db49
...@@ -52,7 +52,6 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView { ...@@ -52,7 +52,6 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
invitePresenter.getRuserShareCode() invitePresenter.getRuserShareCode()
initView() initView()
initListener() initListener()
} }
...@@ -132,14 +131,11 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView { ...@@ -132,14 +131,11 @@ class ShareActivity : BaseActivity(), View.OnClickListener, InviteView {
* 图片分享 * 图片分享
*/ */
private fun shareImgDialog() { private fun shareImgDialog() {
val shareDialog = ShareImageDialog(this, myShareUrl) val shareDialog = ShareImageDialog(this, myShareUrl, userManager.shareCode)
shareDialog.setOnShareOKListener(object : ShareImageDialog.OnShareOKListener { shareDialog.setOnShareOKListener(object : ShareImageDialog.OnShareOKListener {
override fun onShareOk() {} override fun onShareOk() {}
}) })
val content = ""
shareDialog.setShareAvatar("https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/ic_my_coin.png") shareDialog.setShareAvatar("https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/ic_my_coin.png")
shareDialog.setShareTitle("Hi,我是用户" + userManager.name)
shareDialog.setShareContent(content)
shareDialog.show() shareDialog.show()
} }
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/base/BaseActivity.java
View file @ faf6db49
...@@ -86,8 +86,8 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base ...@@ -86,8 +86,8 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
private void setDarkStatusBar() { private void setDarkStatusBar() {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().setStatusBarColor(getResources().getColor(R.color.red)); getWindow().setStatusBarColor(getResources().getColor(R.color.full_transparent));
getWindow().setNavigationBarColor(getResources().getColor(R.color.red)); getWindow().setNavigationBarColor(getResources().getColor(R.color.full_transparent));
int vis = getWindow().getDecorView().getSystemUiVisibility(); int vis = getWindow().getDecorView().getSystemUiVisibility();
vis |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; vis |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
getWindow().getDecorView().setSystemUiVisibility(vis); getWindow().getDecorView().setSystemUiVisibility(vis);
...@@ -95,7 +95,6 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base ...@@ -95,7 +95,6 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
public void statusBarDark(boolean isDark) { public void statusBarDark(boolean isDark) {
ImmersionBar.with(this).transparentStatusBar(); ImmersionBar.with(this).transparentStatusBar();
// ImmersionBar.with(this).statusBarDarkFont(isDark, 0.5f).init();
} }
@Override @Override
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/CommonListAdapter.kt
View file @ faf6db49
...@@ -23,7 +23,7 @@ class CommonListAdapter : BaseQuickAdapter<UserData, BaseViewHolder>(R.layout.it ...@@ -23,7 +23,7 @@ class CommonListAdapter : BaseQuickAdapter<UserData, BaseViewHolder>(R.layout.it
holder.getView<TextView>(R.id.tv_recommend_info).text = holder.getView<TextView>(R.id.tv_recommend_info).text =
item.age + " " + item.lastCity + " " + item.career item.age + " " + item.lastCity + " " + item.career
val tvRealLabel = holder.getView<TextView>(R.id.tv_real_label) val tvRealLabel = holder.getView<ImageView>(R.id.tv_real_label)
if (item.idcardStatus == 1) { if (item.idcardStatus == 1) {
tvRealLabel.visibility = View.VISIBLE tvRealLabel.visibility = View.VISIBLE
} else { } else {
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/UserProfileAlbumAdapter.kt
View file @ faf6db49
package com.duben.roseplaylet.ui.adapter package com.duben.roseplaylet.ui.adapter
import android.content.Context
import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import com.chad.library.adapter.base.BaseQuickAdapter
import android.widget.ImageView import com.chad.library.adapter.base.viewholder.BaseViewHolder
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.duben.library.utils.GlideUtils import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R import com.duben.roseplaylet.R
import com.duben.roseplaylet.ui.adapter.base.OnItemClickListener
import com.duben.roseplaylet.utils.LogUtil
class UserProfileAlbumAdapter(val context: Context, val images: List<String>) : class UserProfileAlbumAdapter :
RecyclerView.Adapter<RecyclerView.ViewHolder>() { BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_user_profile_album) {
companion object {
const val HOLDER_TYPE_EMPTY = 0
const val HOLDER_TYPE_IMAGE = 1
}
private var isShowAuth = false private var isShowAuth = false
private var mOnItemClickListener: OnItemClickListener? = null
fun showAuth(showAuth: Boolean) { fun showAuth(showAuth: Boolean) {
this.isShowAuth = showAuth this.isShowAuth = showAuth
} }
fun setOnItemClickListener(listener: OnItemClickListener) { override fun convert(holder: BaseViewHolder, item: String) {
mOnItemClickListener = listener
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
if (viewType == OrderRecordAdapter.HOLDER_TYPE_EMPTY) {
val emptyView =
LayoutInflater.from(parent.context).inflate(R.layout.item_empty_cash, parent, false)
return EmptyHolder(emptyView)
}
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_user_profile_album, parent, false)
return ViewHolder(view)
}
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val tv_auth: TextView = view.findViewById(R.id.tv_auth)
val iv_photo: ImageView = view.findViewById(R.id.iv_photo)
}
inner class EmptyHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
if (holder is EmptyHolder) {
return
}
val myholder = holder as ViewHolder
if (isShowAuth) { if (isShowAuth) {
myholder.tv_auth.visibility = View.VISIBLE holder.getView<View>(R.id.tv_auth).visibility = View.VISIBLE
} else { } else {
myholder.tv_auth.visibility = View.GONE holder.getView<View>(R.id.tv_auth).visibility = View.GONE
}
myholder.iv_photo.setOnClickListener {
mOnItemClickListener?.onItemClick(it, position)
} }
LogUtil.d("AAAAAA" + images[position]) GlideUtils.loadThumbRoundImageView(
GlideUtils.loadImageViewNoAnim2(context, images[position], myholder.iv_photo) context,
item,
holder.getView(R.id.iv_photo)
)
} }
override fun getItemCount(): Int {
return if (images.isEmpty()) {
1
} else {
images.size
}
}
override fun getItemViewType(position: Int): Int {
if (images.isEmpty()) {
return HOLDER_TYPE_EMPTY
}
return HOLDER_TYPE_IMAGE
}
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/CsjVedioFragment.kt
View file @ faf6db49
...@@ -51,15 +51,12 @@ class CsjVedioFragment : LazyLoadBaseFragment(), View.OnClickListener, OnRefresh ...@@ -51,15 +51,12 @@ class CsjVedioFragment : LazyLoadBaseFragment(), View.OnClickListener, OnRefresh
var mSelectTabIndex = -1 var mSelectTabIndex = -1
private val tabsData = mutableListOf<HotStyleTypesBean>() private val tabsData = mutableListOf<HotStyleTypesBean>()
private var vpAdapter: CsjVideoPageAdapter? = null private var vpAdapter: CsjVideoPageAdapter? = null
private var alipayTime = 0
private val userManager by lazy { UserManager.getInstance() } private val userManager by lazy { UserManager.getInstance() }
override fun getContentViewLayoutID() = R.layout.fragment_csjvedio override fun getContentViewLayoutID() = R.layout.fragment_csjvedio
override fun initViewsAndEvents() { override fun initViewsAndEvents() {}
}
override fun onFragmentFirstVisible() { override fun onFragmentFirstVisible() {
initVp() initVp()
...@@ -107,11 +104,12 @@ class CsjVedioFragment : LazyLoadBaseFragment(), View.OnClickListener, OnRefresh ...@@ -107,11 +104,12 @@ class CsjVedioFragment : LazyLoadBaseFragment(), View.OnClickListener, OnRefresh
requireActivity().runOnUiThread { requireActivity().runOnUiThread {
if (!TextUtils.isEmpty(userManager?.userID)) { if (!TextUtils.isEmpty(userManager?.userID)) {
CsjDJXSdkManager.requestDramaCategoryList(object : CsjDJXSdkManager.CsjdramaCategoryListListener { CsjDJXSdkManager.requestDramaCategoryList(object :
CsjDJXSdkManager.CsjdramaCategoryListListener {
override fun dramaCategoryListSuccess(list: MutableList<HotStyleTypesBean>) { override fun dramaCategoryListSuccess(list: MutableList<HotStyleTypesBean>) {
tabsData.clear() tabsData.clear()
tabsData.addAll(list) tabsData.addAll(list)
LogUtil.d("mcg--->"+JsonUtil.toJson(list)) LogUtil.d("mcg--->" + JsonUtil.toJson(list))
if (tabsData.isNotEmpty()) { if (tabsData.isNotEmpty()) {
mSelectTabIndex = 0 mSelectTabIndex = 0
...@@ -130,10 +128,7 @@ class CsjVedioFragment : LazyLoadBaseFragment(), View.OnClickListener, OnRefresh ...@@ -130,10 +128,7 @@ class CsjVedioFragment : LazyLoadBaseFragment(), View.OnClickListener, OnRefresh
} }
} }
override fun dramaCategoryListFail() { override fun dramaCategoryListFail() {}
}
}) })
} }
} }
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/FirstFragment.kt
View file @ faf6db49
...@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment ...@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment
import com.duben.roseplaylet.R import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.AppConfig import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.common.Constant import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.manager.TrackManager
import com.duben.roseplaylet.manager.UserManager import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.presenters.FirstPresenter import com.duben.roseplaylet.mvp.presenters.FirstPresenter
import com.duben.roseplaylet.mvp.views.FirstView import com.duben.roseplaylet.mvp.views.FirstView
...@@ -25,11 +26,6 @@ import kotlinx.android.synthetic.main.fragment_first.* ...@@ -25,11 +26,6 @@ import kotlinx.android.synthetic.main.fragment_first.*
*/ */
class FirstFragment : LazyLoadBaseFragment(), FirstView { class FirstFragment : LazyLoadBaseFragment(), FirstView {
companion object {
var currentPosition = 0
}
private var mSelectTabIndex = 0
private val tabsData = mutableListOf<String>() private val tabsData = mutableListOf<String>()
private val fragments = mutableListOf<Fragment>() private val fragments = mutableListOf<Fragment>()
private var vpAdapter: RecommendPageAdapter? = null private var vpAdapter: RecommendPageAdapter? = null
...@@ -52,9 +48,11 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView { ...@@ -52,9 +48,11 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView {
override fun onFragmentResume() { override fun onFragmentResume() {
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_ONE) { if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_ONE) {
// if (TextUtils.isEmpty(userManager?.userID)) { if (TextUtils.isEmpty(userManager?.userID)) {
// firstPresenter.userLogin() firstPresenter.userLogin()
// } } else {
TrackManager.getInstance().getBaseMsg()
}
} }
} }
...@@ -64,26 +62,33 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView { ...@@ -64,26 +62,33 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView {
} }
private fun initVp2() { private fun initVp2() {
tabsData.add("推 荐") tabsData.add("推荐")
tabsData.add("VIP专享") tabsData.add("VIP专享")
fragments.clear() fragments.clear()
fragments.add(CsjVedioFragment.newInstance()) fragments.add(CsjVedioFragment.newInstance())
fragments.add(MainFragment.newInstance()) fragments.add(VipEnjoyFragment.newInstance())
vpAdapter = RecommendPageAdapter(fragments, this) vpAdapter = RecommendPageAdapter(fragments, this)
vp2_recommend.adapter = vpAdapter vp2_recommend.adapter = vpAdapter
TabLayoutMediator(tab_recommend, vp2_recommend) { tab, position -> TabLayoutMediator(tab_recommend, vp2_recommend) { tab, position ->
// 初始化Tab
tab.id = position tab.id = position
tab.customView = getTabView(position) if (tabsData.size > 0) {
if (position == 0) {
tab.customView = getTabView(tabsData[position], true)
} else {
tab.customView = getTabView(tabsData[position], false)
}
}
}.attach() }.attach()
tab_recommend.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { tab_recommend.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
override fun onTabSelected(tab: TabLayout.Tab?) { override fun onTabSelected(tab: TabLayout.Tab?) {
currentPosition = tab!!.position tab?.let {
mSelectTabIndex = tab!!.id updateTab(it.customView, true)
updateTab(tab, true, mSelectTabIndex) }
} }
override fun onTabUnselected(tab: TabLayout.Tab?) { override fun onTabUnselected(tab: TabLayout.Tab?) {
updateTab(tab, false, mSelectTabIndex) tab?.let { updateTab(it.customView, false) }
} }
override fun onTabReselected(tab: TabLayout.Tab?) { override fun onTabReselected(tab: TabLayout.Tab?) {
...@@ -95,34 +100,25 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView { ...@@ -95,34 +100,25 @@ class FirstFragment : LazyLoadBaseFragment(), FirstView {
vp2_recommend.isUserInputEnabled = false vp2_recommend.isUserInputEnabled = false
} }
private fun getTabView(position: Int): View { private fun getTabView(text: String, isSelected: Boolean): View {
val view = LayoutInflater.from(requireContext()).inflate(R.layout.item_recommend_tab, null) val view = LayoutInflater.from(requireContext()).inflate(R.layout.item_square_tab, null)
view.findViewById<TextView>(R.id.item_tv).text = tabsData[position] view.findViewById<TextView>(R.id.item_tv).text = text
if (position == 0) { updateTab(view, isSelected)
view.findViewById<View>(R.id.item_line).background =
ContextCompat.getDrawable(requireContext(), R.drawable.shape_line_corner_red)
}
return view return view
} }
private fun updateTab(tab: TabLayout.Tab?, isSelected: Boolean, position: Int) {
tab?.customView?.let { private fun updateTab(view: View?, isSelected: Boolean) {
view?.let {
val text = it.findViewById<TextView>(R.id.item_tv) val text = it.findViewById<TextView>(R.id.item_tv)
val line = it.findViewById<View>(R.id.item_line) val bar = it.findViewById<View>(R.id.view_bar)
if (isSelected) { if (isSelected) {
line.visibility = View.VISIBLE text.setTextColor(ContextCompat.getColor(requireContext(), R.color.color_E4C46C))
text.setTextColor(ContextCompat.getColor(requireContext(), R.color.black)) bar.visibility = View.VISIBLE
} else { } else {
text.setTextColor( text.setTextColor(ContextCompat.getColor(requireContext(), R.color.color_959595))
ContextCompat.getColor( bar.visibility = View.INVISIBLE
requireContext(),
R.color.black
)
)
line.visibility = View.INVISIBLE
} }
line.background =
ContextCompat.getDrawable(requireContext(), R.drawable.shape_line_corner_red)
} }
} }
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/IMConversationFragment.kt 0 → 100644
View file @ faf6db49
package com.duben.roseplaylet.ui.fragment
import android.view.View
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.roseplaylet.R
import com.duben.roseplaylet.manager.UserManager
import com.tencent.qcloud.tuikit.tuiconversation.classicui.page.TUIConversationFragment
class IMConversationFragment : TUIConversationFragment(), View.OnClickListener {
private val userManager by lazy { UserManager.getInstance() }
override fun onClick(v: View?) {
if (AntiShake.check(v?.id)) return
when (v?.id) {
R.id.tv_clear_noread -> {
// 清除未读
}
R.id.tv_clear_list -> {
// 清除列表
}
}
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MessageFragment.kt
View file @ faf6db49
...@@ -23,8 +23,6 @@ class MessageFragment : LazyLoadBaseFragment(), View.OnClickListener { ...@@ -23,8 +23,6 @@ class MessageFragment : LazyLoadBaseFragment(), View.OnClickListener {
private val fragmentsData = mutableListOf<Fragment>() private val fragmentsData = mutableListOf<Fragment>()
private var vpAdapter: MsgPageAdapter? = null private var vpAdapter: MsgPageAdapter? = null
private val userManager by lazy { UserManager.getInstance() }
override fun getContentViewLayoutID() = R.layout.fragment_main_message override fun getContentViewLayoutID() = R.layout.fragment_main_message
override fun initViewsAndEvents() { override fun initViewsAndEvents() {
...@@ -38,7 +36,7 @@ class MessageFragment : LazyLoadBaseFragment(), View.OnClickListener { ...@@ -38,7 +36,7 @@ class MessageFragment : LazyLoadBaseFragment(), View.OnClickListener {
tabsData.add(String.format("聊天")) tabsData.add(String.format("聊天"))
// tabsData.add(String.format("系统消息")) // tabsData.add(String.format("系统消息"))
fragmentsData.add(TUIConversationFragment()) fragmentsData.add(IMConversationFragment())
// fragmentsData.add(SystemMsgFragment()) // fragmentsData.add(SystemMsgFragment())
vpAdapter = MsgPageAdapter(tabsData, fragmentsData, requireActivity()) vpAdapter = MsgPageAdapter(tabsData, fragmentsData, requireActivity())
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MyFragment.kt
View file @ faf6db49
...@@ -20,6 +20,7 @@ import com.duben.roseplaylet.mvp.views.MyView ...@@ -20,6 +20,7 @@ import com.duben.roseplaylet.mvp.views.MyView
import com.duben.roseplaylet.ui.activitys.* import com.duben.roseplaylet.ui.activitys.*
import com.duben.roseplaylet.ui.fragment.base.LazyLoadBaseFragment import com.duben.roseplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.roseplaylet.utils.SpanUtils import com.duben.roseplaylet.utils.SpanUtils
import com.duben.roseplaylet.utils.TimeRender
import com.duben.roseplaylet.utils.UIUtils import com.duben.roseplaylet.utils.UIUtils
import kotlinx.android.synthetic.main.fragment_main_my.* import kotlinx.android.synthetic.main.fragment_main_my.*
...@@ -78,7 +79,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -78,7 +79,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
R.id.ll_edit_profile -> { R.id.ll_edit_profile -> {
readyGo(EditProfileActivity::class.java) readyGo(EditProfileActivity::class.java)
} }
R.id.ll_my_vip -> { R.id.iv_my_vip -> {
if (!userManager.vipFlag) { if (!userManager.vipFlag) {
readyGo(VipActivity::class.java) readyGo(VipActivity::class.java)
} }
...@@ -135,6 +136,20 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -135,6 +136,20 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
tv_my_id.text = "ID:" + data.idcode tv_my_id.text = "ID:" + data.idcode
GlideUtils.loadThumbImageView(requireContext(), data.headerUrl, civ_my_avatar) GlideUtils.loadThumbImageView(requireContext(), data.headerUrl, civ_my_avatar)
if (data.expireTime > 0) {
rl_my_vip.visibility = View.VISIBLE
iv_my_vip.visibility = View.GONE
if (data.isForever) {
tv_vip_date.text = "有效期: 永久有效"
} else {
tv_vip_date.text =
"到期时间 ${TimeRender.formatDate(data.expireTime, TimeRender.DEFAULT_FORMAT)}"
}
} else {
rl_my_vip.visibility = View.VISIBLE
iv_my_vip.visibility = View.GONE
}
if (data.sex == 1) { if (data.sex == 1) {
// 男性无认证页面 // 男性无认证页面
ll_my_auth.visibility = View.GONE ll_my_auth.visibility = View.GONE
...@@ -165,7 +180,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -165,7 +180,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
ll_my_ilike.setOnClickListener(this) ll_my_ilike.setOnClickListener(this)
ll_my_likeme.setOnClickListener(this) ll_my_likeme.setOnClickListener(this)
ll_my_seeme.setOnClickListener(this) ll_my_seeme.setOnClickListener(this)
ll_my_vip.setOnClickListener(this) iv_my_vip.setOnClickListener(this)
ll_my_wallet.setOnClickListener(this) ll_my_wallet.setOnClickListener(this)
ll_my_invite.setOnClickListener(this) ll_my_invite.setOnClickListener(this)
ll_my_album.setOnClickListener(this) ll_my_album.setOnClickListener(this)
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/VipEnjoyFragment.kt
View file @ faf6db49
...@@ -9,14 +9,15 @@ import com.duben.roseplaylet.R ...@@ -9,14 +9,15 @@ import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.AppConfig import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.common.Constant import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.manager.LocalVedioManager import com.duben.roseplaylet.manager.LocalVedioManager
import com.duben.roseplaylet.mvp.model.BannerBean
import com.duben.roseplaylet.mvp.model.BannerList import com.duben.roseplaylet.mvp.model.BannerList
import com.duben.roseplaylet.mvp.model.VedioBean import com.duben.roseplaylet.mvp.model.VedioBean
import com.duben.roseplaylet.mvp.presenters.VipEnjoyPresenter import com.duben.roseplaylet.mvp.presenters.VipEnjoyPresenter
import com.duben.roseplaylet.mvp.views.VipEnjoyView import com.duben.roseplaylet.mvp.views.VipEnjoyView
import com.duben.roseplaylet.ui.adapter.ImageTitleAdapter
import com.duben.roseplaylet.ui.adapter.VipEnjoyAdapter import com.duben.roseplaylet.ui.adapter.VipEnjoyAdapter
import com.duben.roseplaylet.ui.fragment.base.LazyLoadBaseFragment import com.duben.roseplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.scwang.smartrefresh.layout.api.RefreshLayout import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener
import com.scwang.smartrefresh.layout.listener.OnRefreshListener import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import kotlinx.android.synthetic.main.fragment_vip_enjoy.* import kotlinx.android.synthetic.main.fragment_vip_enjoy.*
...@@ -25,8 +26,7 @@ import kotlinx.android.synthetic.main.fragment_vip_enjoy.* ...@@ -25,8 +26,7 @@ import kotlinx.android.synthetic.main.fragment_vip_enjoy.*
* @date 2023/12/5 * @date 2023/12/5
* @desc VIP尊享页面 * @desc VIP尊享页面
*/ */
class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyView, class VipEnjoyFragment : LazyLoadBaseFragment(), VipEnjoyView, OnRefreshListener {
OnRefreshListener {
companion object { companion object {
fun newInstance(): Fragment { fun newInstance(): Fragment {
...@@ -40,8 +40,8 @@ class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyVie ...@@ -40,8 +40,8 @@ class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyVie
private val vipEnjoyPresenter by lazy { VipEnjoyPresenter() } private val vipEnjoyPresenter by lazy { VipEnjoyPresenter() }
private lateinit var vipEnjoyAdapter: VipEnjoyAdapter private lateinit var vipEnjoyAdapter: VipEnjoyAdapter
private var page = 1 // 分页
private var pageSize = Constant.PAGE_SIZE // 分页 private val bannerList = mutableListOf<BannerBean>()
override fun initViewsAndEvents() { override fun initViewsAndEvents() {
vipEnjoyPresenter.attachView(this) vipEnjoyPresenter.attachView(this)
...@@ -83,15 +83,22 @@ class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyVie ...@@ -83,15 +83,22 @@ class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyVie
private fun initListener() { private fun initListener() {
srl_enjoy.setEnableRefresh(true) srl_enjoy.setEnableRefresh(true)
srl_enjoy.setOnLoadMoreListener(this)
srl_enjoy.setOnRefreshListener(this) srl_enjoy.setOnRefreshListener(this)
} }
override fun onFragmentResume() {
banner?.start()
}
override fun onFragmentPause() {
banner?.stop()
}
private fun myRefresh() { private fun myRefresh() {
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_THREE) { if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_ONE) {
page = 1
srl_enjoy.resetNoMoreData() srl_enjoy.resetNoMoreData()
vipEnjoyPresenter.getVedio4List(page, pageSize) vipEnjoyPresenter.orders()
vipEnjoyPresenter.topTabs()
} }
} }
...@@ -99,34 +106,35 @@ class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyVie ...@@ -99,34 +106,35 @@ class VipEnjoyFragment : LazyLoadBaseFragment(), OnLoadMoreListener, VipEnjoyVie
myRefresh() myRefresh()
} }
override fun onLoadMore(refreshLayout: RefreshLayout) { override fun topTabsSuc(data: BannerList?) {
page = ++page if (data != null && data.list != null && data.list.size > 0) {
vipEnjoyPresenter.getVedio4List(page, pageSize) bannerList.clear()
for (i in 0 until data.list.size) {
val bean = BannerBean()
bean.title = data.list[i].topTabsReamrk
bean.imageRes = data.list[i].typeImg
bannerList.add(bean)
}
banner.addBannerLifecycleObserver(this)
.setAdapter(ImageTitleAdapter(bannerList))
.setOnBannerListener { data2, position ->
val banner = data.list[position]
LocalVedioManager.startVedioDetailActivityForType(requireActivity(), banner)
}
}
} }
override fun getVedio4ListSuc(data: BannerList) { override fun ordersSuc(data: BannerList?) {
if (activity == null || requireActivity().isFinishing) { if (activity == null || requireActivity().isFinishing) {
srl_enjoy?.finishRefresh(true) srl_enjoy?.finishRefresh(true)
return return
} }
if (::vipEnjoyAdapter.isInitialized) { if (::vipEnjoyAdapter.isInitialized) {
if (page == 1) { srl_enjoy.finishRefresh(true)
srl_enjoy.finishRefresh(true) vipEnjoyAdapter.setNewInstance(data?.list)
vipEnjoyAdapter.setNewInstance(data.list)
} else {
if (data.list.size < pageSize) {
srl_enjoy.finishLoadMoreWithNoMoreData()
} else {
srl_enjoy.finishLoadMore()
}
vipEnjoyAdapter.addData(data.list)
}
} }
} }
override fun getVedio4ListFail() {
}
} }
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ShareDialog.kt
View file @ faf6db49
...@@ -16,6 +16,7 @@ import com.duben.library.utils.ConstantUtil ...@@ -16,6 +16,7 @@ import com.duben.library.utils.ConstantUtil
import com.duben.roseplaylet.MintsApplication import com.duben.roseplaylet.MintsApplication
import com.duben.roseplaylet.R import com.duben.roseplaylet.R
import com.duben.roseplaylet.common.Constant import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.utils.LogUtil
import com.duben.roseplaylet.utils.QRCodeUtil import com.duben.roseplaylet.utils.QRCodeUtil
import com.duben.roseplaylet.utils.ToastUtil import com.duben.roseplaylet.utils.ToastUtil
import java.util.* import java.util.*
...@@ -59,7 +60,6 @@ class ShareDialog(context: Context, private val shareUrl: String) : ...@@ -59,7 +60,6 @@ class ShareDialog(context: Context, private val shareUrl: String) :
tvDialogShareNext = findViewById<View>(R.id.tvDialogShareNext) as TextView tvDialogShareNext = findViewById<View>(R.id.tvDialogShareNext) as TextView
tvDialogShareTips = findViewById<View>(R.id.tvDialogShareTips) as TextView tvDialogShareTips = findViewById<View>(R.id.tvDialogShareTips) as TextView
val QRCode = QRCodeUtil.createQRCode(shareUrl, 50) val QRCode = QRCodeUtil.createQRCode(shareUrl, 50)
val inflater = LayoutInflater.from(context) val inflater = LayoutInflater.from(context)
val view1 = inflater.inflate(R.layout.item_share_view, null) val view1 = inflater.inflate(R.layout.item_share_view, null)
......
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ShareImageDialog.kt
View file @ faf6db49
...@@ -3,10 +3,8 @@ package com.duben.roseplaylet.ui.widgets ...@@ -3,10 +3,8 @@ package com.duben.roseplaylet.ui.widgets
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
import android.text.Spanned
import android.text.TextUtils import android.text.TextUtils
import android.view.* import android.view.*
import android.widget.CheckBox
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
...@@ -31,7 +29,8 @@ import kotlin.concurrent.schedule ...@@ -31,7 +29,8 @@ import kotlin.concurrent.schedule
class ShareImageDialog( class ShareImageDialog(
context: Context, context: Context,
shareUrl: String shareUrl: String,
shareCode: String,
) : Dialog(context, R.style.dialog) { ) : Dialog(context, R.style.dialog) {
private val llDialogShareWx: LinearLayout private val llDialogShareWx: LinearLayout
...@@ -50,7 +49,7 @@ class ShareImageDialog( ...@@ -50,7 +49,7 @@ class ShareImageDialog(
private val wechatMoments by lazy { ShareSDK.getPlatform(WechatMoments.NAME) } private val wechatMoments by lazy { ShareSDK.getPlatform(WechatMoments.NAME) }
init { init {
setContentView(R.layout.dialog_share) setContentView(R.layout.dialog_share_image)
// 设置window属性 // 设置window属性
window?.let { window?.let {
val lp = it.attributes val lp = it.attributes
...@@ -79,22 +78,22 @@ class ShareImageDialog( ...@@ -79,22 +78,22 @@ class ShareImageDialog(
val QRCode = QRCodeUtil.createQRCode(shareUrl, 50) val QRCode = QRCodeUtil.createQRCode(shareUrl, 50)
val inflater = LayoutInflater.from(context) val inflater = LayoutInflater.from(context)
val view1 = inflater.inflate(R.layout.item_share_view, null) val view1 = inflater.inflate(R.layout.item_share_view, null)
val view2 = inflater.inflate(R.layout.item_share_view, null) // val view2 = inflater.inflate(R.layout.item_share_view, null)
view1.findViewById<View>(R.id.item_iv_bg).setBackgroundResource(R.mipmap.bg_share_1) view1.findViewById<View>(R.id.item_iv_bg).setBackgroundResource(R.mipmap.bg_share_1)
view2.findViewById<View>(R.id.item_iv_bg).setBackgroundResource(R.mipmap.bg_share_2) // view2.findViewById<View>(R.id.item_iv_bg).setBackgroundResource(R.mipmap.bg_share_2)
view1.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode) view1.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode)
view2.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode) view1.findViewById<TextView>(R.id.tv_share_code).text = "邀请码：${shareCode}"
// view2.findViewById<ImageView>(R.id.item_iv_qrcode).setImageBitmap(QRCode)
mViews = arrayListOf() mViews = arrayListOf()
mViews.add(view1) mViews.add(view1)
mViews.add(view2) // mViews.add(view2)
pagerAdapter = SharePagerAdapter(mViews) pagerAdapter = SharePagerAdapter(mViews)
viewPager.adapter = pagerAdapter viewPager.adapter = pagerAdapter
val cb2 = view2.findViewById<CheckBox>(R.id.item_cb_check) // val cb2 = view2.findViewById<CheckBox>(R.id.item_cb_check)
val cb1 = view1.findViewById<CheckBox>(R.id.item_cb_check) // val cb1 = view1.findViewById<CheckBox>(R.id.item_cb_check)
// cb1.isChecked = true
cb1.isChecked = true
viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
override fun onPageScrolled( override fun onPageScrolled(
...@@ -105,13 +104,13 @@ class ShareImageDialog( ...@@ -105,13 +104,13 @@ class ShareImageDialog(
} }
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
if (position == 0) { // if (position == 0) {
cb1.isChecked = true // cb1.isChecked = true
cb2.isChecked = false // cb2.isChecked = false
} else { // } else {
cb1.isChecked = false // cb1.isChecked = false
cb2.isChecked = true // cb2.isChecked = true
} // }
} }
override fun onPageScrollStateChanged(state: Int) {} override fun onPageScrollStateChanged(state: Int) {}
...@@ -150,25 +149,13 @@ class ShareImageDialog( ...@@ -150,25 +149,13 @@ class ShareImageDialog(
fun setShareAvatar(imgSrc: String) { fun setShareAvatar(imgSrc: String) {
mViews.forEach { mViews.forEach {
val avatar = it.findViewById<ImageView>(R.id.item_iv_avatar) val avatar = it.findViewById<ImageView>(R.id.item_iv_avatar)
GlideUtils.loadImageViewLoding(context, imgSrc, avatar, R.mipmap.ic_my, R.mipmap.ic_my) GlideUtils.loadImageViewLoding(
} context,
} imgSrc,
avatar,
fun setShareTitle(title: String) { R.mipmap.ic_launcher_main,
mViews.forEach { R.mipmap.ic_launcher_main
it.findViewById<TextView>(R.id.item_tv_name).text = title )
}
}
fun setShareContent(content: String) {
mViews.forEach {
it.findViewById<TextView>(R.id.item_tv_info).text = content
}
}
fun setShareContent(content: Spanned) {
mViews.forEach {
it.findViewById<TextView>(R.id.item_tv_info).text = content
} }
} }
......
video/app/src/main/res/layout/activity_aboutus.xml
View file @ faf6db49
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/black"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/header_layout" /> <include layout="@layout/header_layout" />
...@@ -27,7 +26,7 @@ ...@@ -27,7 +26,7 @@
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="#454A69" android:textColor="@color/white"
android:textSize="13sp" /> android:textSize="13sp" />
<ImageView <ImageView
...@@ -37,23 +36,6 @@ ...@@ -37,23 +36,6 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_launcher_main" /> android:src="@mipmap/ic_launcher_main" />
<!-- <FrameLayout-->
<!-- android:layout_width="200dp"-->
<!-- android:layout_height="200dp">-->
<!-- <com.mingshu.goldcow.ui.widgets.RunHalfView-->
<!-- android:layout_width="200dp"-->
<!-- android:layout_height="200dp" />-->
<!-- <TextView-->
<!-- android:layout_margin="10dp"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white" />-->
<!-- </FrameLayout>-->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
......
video/app/src/main/res/layout/activity_basic_user_profile.xml
View file @ faf6db49
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
android:src="@mipmap/ic_alipay" /> android:src="@mipmap/ic_upload_img" />
</FrameLayout> </FrameLayout>
......
video/app/src/main/res/layout/activity_share.xml
View file @ faf6db49
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
android:id="@+id/tv_share_img" android:id="@+id/tv_share_img"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="20dp" android:layout_marginEnd="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_share_btn" android:background="@drawable/shape_share_btn"
android:elevation="2dp" android:elevation="2dp"
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
android:id="@+id/tv_share_url" android:id="@+id/tv_share_url"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="20dp" android:layout_marginStart="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_share_btn" android:background="@drawable/shape_share_btn"
android:elevation="2dp" android:elevation="2dp"
...@@ -419,9 +419,10 @@ ...@@ -419,9 +419,10 @@
android:overScrollMode="never" android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<View style="@style/view_bottom" />
</LinearLayout> </LinearLayout>
<View style="@style/view_bottom" />
</LinearLayout> </LinearLayout>
</com.duben.roseplaylet.ui.widgets.ElasticScrollView> </com.duben.roseplaylet.ui.widgets.ElasticScrollView>
</LinearLayout> </LinearLayout>
......
video/app/src/main/res/layout/activity_user_profile.xml
View file @ faf6db49
...@@ -200,8 +200,7 @@ ...@@ -200,8 +200,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_2" android:id="@+id/tv_info_2"
...@@ -212,8 +211,7 @@ ...@@ -212,8 +211,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_3" android:id="@+id/tv_info_3"
...@@ -224,8 +222,7 @@ ...@@ -224,8 +222,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_4" android:id="@+id/tv_info_4"
...@@ -236,8 +233,7 @@ ...@@ -236,8 +233,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_5" android:id="@+id/tv_info_5"
...@@ -248,8 +244,7 @@ ...@@ -248,8 +244,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_6" android:id="@+id/tv_info_6"
...@@ -260,8 +255,7 @@ ...@@ -260,8 +255,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_7" android:id="@+id/tv_info_7"
...@@ -272,8 +266,7 @@ ...@@ -272,8 +266,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
<TextView <TextView
android:id="@+id/tv_info_8" android:id="@+id/tv_info_8"
...@@ -284,8 +277,7 @@ ...@@ -284,8 +277,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/str_secret" android:text="@string/str_secret"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="16sp" android:textSize="16sp" />
app:drawableStartCompat="@mipmap/ic_text_clear" />
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -314,24 +306,22 @@ ...@@ -314,24 +306,22 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="40dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="30dp" android:layout_marginBottom="30dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp"> android:paddingEnd="20dp">
<TextView <ImageView
android:id="@+id/tv_wechat" android:id="@+id/tv_wechat"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_profile_chat"
android:elevation="1dp" android:elevation="1dp"
android:gravity="center" android:scaleType="fitXY"
android:text="她的微信" android:src="@mipmap/ic_button_wechat"
android:textColor="@color/color_0B0907"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <TextView
...@@ -347,17 +337,16 @@ ...@@ -347,17 +337,16 @@
android:textColor="@color/color_0B0907" android:textColor="@color/color_0B0907"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView
<ImageView
android:id="@+id/tv_chat" android:id="@+id/tv_chat"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="15dp" android:layout_marginEnd="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_profile_chat"
android:elevation="1dp" android:elevation="1dp"
android:gravity="center" android:scaleType="fitXY"
android:text="私聊" android:src="@mipmap/ic_button_chat"
android:textColor="@color/color_0B0907"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
......
video/app/src/main/res/layout/activity_write_signature.xml
View file @ faf6db49
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/shape_bg_black" android:background="@drawable/shape_bg_black"
android:elevation="2dp" android:elevation="2dp"
android:text="发布心情" android:text="发布签名"
android:textColor="@color/white" android:textColor="@color/white"
android:textStyle="bold" /> android:textStyle="bold" />
......
video/app/src/main/res/layout/dialog_real_auth.xml
View file @ faf6db49
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="30dp" android:gravity="center">
android:layout_marginEnd="30dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout <FrameLayout
android:id="@+id/ll_content" android:id="@+id/ll_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_below="@id/iv_avatar"
android:background="@drawable/shape_bg_profile_count"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="真人认证"
android:textColor="@color/white"
android:textSize="20sp" />
<ImageView <ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="20dp"
android:src="@mipmap/ic_my_avat" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="400dp"
android:layout_marginTop="30dp" android:src="@mipmap/bg_real_auth" />
android:paddingStart="30dp"
android:paddingEnd="30dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="10dp"
android:text="认证图标"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_call_wx" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="10dp"
android:text="优先推荐"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_call_wx" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingStart="30dp"
android:paddingEnd="30dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="10dp"
android:text="免费私聊男士"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_call_wx" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="10dp"
android:text="免费发布动态"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableStartCompat="@mipmap/ic_call_wx" />
</LinearLayout>
<TextView <TextView
android:id="@+id/tv_to_auth" android:id="@+id/tv_to_auth"
android:layout_width="260dp" android:layout_width="260dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_marginTop="20dp" android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="30dp" android:layout_marginBottom="30dp"
android:background="@drawable/shape_profile_chat" android:background="@drawable/shape_profile_chat"
android:gravity="center" android:gravity="center"
android:text="真人认证" android:text="真人认证"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" /> android:textSize="18sp" />
</FrameLayout>
</LinearLayout>
<ImageView <ImageView
android:id="@+id/iv_close" android:id="@+id/iv_close"
......
video/app/src/main/res/layout/dialog_see_wechat.xml
View file @ faf6db49
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:text="复制" android:text="复制"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="16sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
......
video/app/src/main/res/layout/dialog_share.xml
View file @ faf6db49
...@@ -69,8 +69,6 @@ ...@@ -69,8 +69,6 @@
android:textSize="12sp" android:textSize="12sp"
android:visibility="gone" /> android:visibility="gone" />
<View style="@style/view_line_808080" />
<TextView <TextView
android:id="@+id/tvDialogShareNext" android:id="@+id/tvDialogShareNext"
android:layout_width="match_parent" android:layout_width="match_parent"
......
video/app/src/main/res/layout/dialog_share_image.xml
View file @ faf6db49
...@@ -9,11 +9,9 @@ ...@@ -9,11 +9,9 @@
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager" android:id="@+id/view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="450dp" android:layout_height="match_parent"
android:layout_marginBottom="30dp" android:layout_marginBottom="180dp"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingStart="60dp"
android:paddingEnd="60dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -22,8 +20,8 @@ ...@@ -22,8 +20,8 @@
<LinearLayout <LinearLayout
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="150dp"
android:background="@drawable/shape_tab_friends" android:background="@drawable/shape_share"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -53,7 +51,7 @@ ...@@ -53,7 +51,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:text="微信" android:text="微信"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
...@@ -76,7 +74,7 @@ ...@@ -76,7 +74,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:text="朋友圈" android:text="朋友圈"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -91,15 +89,13 @@ ...@@ -91,15 +89,13 @@
android:textSize="12sp" android:textSize="12sp"
android:visibility="gone" /> android:visibility="gone" />
<View style="@style/line_3" />
<TextView <TextView
android:id="@+id/tvDialogShareNext" android:id="@+id/tvDialogShareNext"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:gravity="center" android:gravity="center"
android:text="取消" android:text="取消"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp" />
</LinearLayout> </LinearLayout>
......
video/app/src/main/res/layout/fragment_csjvedio.xml
View file @ faf6db49
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#f0f2f5"> android:background="@color/black"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/bg_main"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -27,67 +21,47 @@ ...@@ -27,67 +21,47 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" <com.google.android.material.tabs.TabLayout
android:layout_height="wrap_content" android:id="@+id/tablayout"
android:background="@android:color/transparent" android:layout_width="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:layout_height="38dp"
app:layout_behavior=".ui.widgets.AppBarLayoutBehavior"> android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
<com.google.android.material.tabs.TabLayout android:paddingTop="-10dp"
android:id="@+id/tablayout" app:tabBackground="@null"
android:layout_width="wrap_content" app:tabIndicatorHeight="0dp"
android:layout_height="38dp" app:tabMaxWidth="200dp"
android:layout_marginLeft="10dp" app:tabMinWidth="20dp"
android:layout_marginRight="10dp" app:tabMode="scrollable"
android:paddingTop="-10dp" app:tabPaddingEnd="6dp"
app:tabBackground="@null" app:tabPaddingStart="6dp"
app:tabIndicatorHeight="0dp" app:tabRippleColor="@null" />
app:tabMaxWidth="200dp"
app:tabMinWidth="20dp" <androidx.viewpager2.widget.ViewPager2
app:tabMode="scrollable" android:id="@+id/vp2"
app:tabPaddingEnd="6dp"
app:tabPaddingStart="6dp"
app:tabRippleColor="@null" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/vp2"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.appcompat.widget.LinearLayoutCompat>
</com.scwang.smartrefresh.layout.SmartRefreshLayout> </com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:visibility="gone"
android:id="@+id/ll_main_watching_root" android:id="@+id/ll_main_watching_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_gravity="bottom"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_black" android:background="@drawable/shape_bg_black"
app:layout_constraintBottom_toBottomOf="parent" android:visibility="gone">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<ImageView <ImageView
android:id="@+id/iv_main_watching_pic" android:id="@+id/iv_main_watching_pic"
...@@ -161,5 +135,4 @@ ...@@ -161,5 +135,4 @@
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
video/app/src/main/res/layout/fragment_first.xml
View file @ faf6db49
...@@ -3,15 +3,16 @@ ...@@ -3,15 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/black"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tab_recommend" android:id="@+id/tab_recommend"
android:layout_marginTop="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="left" android:layout_gravity="left"
android:layout_marginTop="20dp"
app:tabBackground="@null" app:tabBackground="@null"
app:tabIndicatorHeight="0dp" app:tabIndicatorHeight="0dp"
app:tabMode="scrollable" app:tabMode="scrollable"
......
video/app/src/main/res/layout/fragment_main_message.xml
View file @ faf6db49
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
android:id="@+id/tv_clear_noread" android:id="@+id/tv_clear_noread"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="清除未读" android:text="清除未读"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -48,7 +47,8 @@ ...@@ -48,7 +47,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="清除列表" android:text="清除列表"
android:textColor="@color/white" /> android:textColor="@color/white"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
......
video/app/src/main/res/layout/fragment_main_my.xml
View file @ faf6db49
...@@ -191,13 +191,31 @@ ...@@ -191,13 +191,31 @@
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/ll_my_vip" android:id="@+id/iv_my_vip"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="80dp"
android:orientation="vertical"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@mipmap/ic_my_vip_label" /> android:src="@mipmap/ic_my_vip_label" />
<RelativeLayout
android:id="@+id/rl_my_vip"
android:layout_width="match_parent"
android:layout_height="80dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_vip_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginStart="20dp"
android:layout_marginBottom="15dp"
android:text="到期时间"
android:textColor="@color/color_31343B"
android:textSize="16sp" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="80dp"
...@@ -376,11 +394,11 @@ ...@@ -376,11 +394,11 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<!-- <ImageView--> <ImageView
<!-- android:layout_width="25dp"--> android:layout_width="25dp"
<!-- android:layout_height="25dp"--> android:layout_height="25dp"
<!-- android:layout_marginEnd="10dp"--> android:layout_marginEnd="10dp"
<!-- android:src="@mipmap/ic_my_wechat" />--> android:src="@mipmap/ic_my_wechat" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
......
video/app/src/main/res/layout/fragment_vip_enjoy.xml
View file @ faf6db49
...@@ -4,25 +4,10 @@ ...@@ -4,25 +4,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/bg_main"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="70dp"
android:layout_marginStart="@dimen/dp_10"
android:paddingTop="20dp"
android:src="@mipmap/ic_enjoy_label" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout <com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_enjoy" android:id="@+id/srl_enjoy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginTop="70dp"
app:srlAccentColor="@color/black" app:srlAccentColor="@color/black"
app:srlPrimaryColor="#f0f2f5"> app:srlPrimaryColor="#f0f2f5">
...@@ -30,25 +15,36 @@ ...@@ -30,25 +15,36 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<FrameLayout <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_enjoy" <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:orientation="vertical">
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp" <com.youth.banner.Banner
android:minHeight="800dp" android:id="@+id/banner"
android:overScrollMode="never" /> android:layout_width="match_parent"
</FrameLayout> android:layout_height="210dp"
android:layout_marginLeft="16dp"
<com.scwang.smartrefresh.layout.footer.ClassicsFooter android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_marginRight="16dp" />
android:layout_height="wrap_content"
app:srlAccentColor="@color/black" <androidx.recyclerview.widget.RecyclerView
app:srlPrimaryColor="#f0f2f5" /> android:id="@+id/rv_enjoy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="14dp"
android:layout_marginTop="10dp"
android:layout_marginRight="14dp"
android:minHeight="800dp"
android:overScrollMode="never" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout> </com.scwang.smartrefresh.layout.SmartRefreshLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
video/app/src/main/res/layout/item_common_data.xml
View file @ faf6db49
...@@ -33,20 +33,14 @@ ...@@ -33,20 +33,14 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <ImageView
android:id="@+id/tv_real_label" android:id="@+id/tv_real_label"
android:layout_width="wrap_content" android:layout_width="55dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_toEndOf="@id/tv_recommend_name" android:layout_toEndOf="@id/tv_recommend_name"
android:background="@drawable/shape_green" android:src="@mipmap/ic_label_real" />
android:gravity="center"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="真人"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_recommend_info" android:id="@+id/tv_recommend_info"
......
video/app/src/main/res/layout/item_empty_album.xml 0 → 100644
View file @ faf6db49
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="70dp"
android:layout_marginTop="20dp"
android:src="@mipmap/icon_list_null" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="暂无数据"
android:textColor="@color/graya"
android:textSize="14sp" />
</LinearLayout>
\ No newline at end of file
video/app/src/main/res/layout/item_hot_style.xml
View file @ faf6db49
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:lines="2" android:lines="2"
android:text="我去平行时空" android:text="我去平行时空"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
......
video/app/src/main/res/layout/item_share_view.xml
View file @ faf6db49
...@@ -9,67 +9,61 @@ ...@@ -9,67 +9,61 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom|center_horizontal"
android:layout_margin="6dp" android:layout_marginBottom="20dp"
android:background="@drawable/shape_gold_card"
android:padding="6dp"> android:padding="6dp">
<com.duben.roseplaylet.ui.widgets.CircleImageView <TextView
android:id="@+id/item_iv_avatar" android:id="@+id/tv_share_code"
android:layout_width="34dp" android:layout_width="wrap_content"
android:layout_height="34dp"
android:layout_centerVertical="true"
app:layout_constraintBottom_toBottomOf="@+id/item_iv_qrcode"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerHorizontal="true"
android:layout_marginStart="4dp" android:layout_marginBottom="10dp"
android:layout_marginEnd="4dp" android:textColor="@color/color_F6DA8F"
android:layout_toEndOf="@id/item_iv_avatar" android:textStyle="bold" />
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/item_iv_qrcode"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@+id/item_iv_avatar"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/item_tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/black"
android:textSize="11sp" />
<TextView
android:id="@+id/item_tv_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textSize="8sp" />
</LinearLayout>
<ImageView <ImageView
android:id="@+id/item_iv_qrcode" android:id="@+id/item_iv_qrcode"
android:layout_width="50dp" android:layout_width="60dp"
android:layout_height="50dp" android:layout_height="60dp"
android:layout_below="@id/tv_share_code"
android:src="@mipmap/ic_launcher_main" />
<ImageView
android:id="@+id/item_iv_avatar"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_below="@id/tv_share_code"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:src="@mipmap/ic_launcher_main" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" <TextView
app:layout_constraintTop_toTopOf="parent" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_iv_qrcode"
android:layout_alignStart="@id/item_iv_qrcode"
android:layout_alignEnd="@id/item_iv_qrcode"
android:layout_marginTop="5dp"
android:text="扫码下载"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_iv_avatar"
android:layout_alignStart="@id/item_iv_avatar"
android:layout_alignEnd="@id/item_iv_avatar"
android:layout_marginTop="5dp"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="12sp" />
</androidx.constraintlayout.widget.ConstraintLayout> </RelativeLayout>
</com.duben.roseplaylet.ui.widgets.CornerView> </com.duben.roseplaylet.ui.widgets.CornerView>
...@@ -81,6 +75,7 @@ ...@@ -81,6 +75,7 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:buttonTint="@color/color_FF9837" android:buttonTint="@color/color_FF9837"
android:clickable="false" /> android:clickable="false"
android:visibility="gone" />
</FrameLayout> </FrameLayout>
\ No newline at end of file
video/app/src/main/res/layout/item_vip_enjoy.xml
View file @ faf6db49
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="重回80年代" android:text="重回80年代"
android:textColor="@color/black" android:textColor="@color/white"
app:layout_constraintStart_toStartOf="@id/image_iv" app:layout_constraintStart_toStartOf="@id/image_iv"
app:layout_constraintTop_toBottomOf="@id/image_iv" /> app:layout_constraintTop_toBottomOf="@id/image_iv" />
......
video/app/src/main/res/layout/layout_user_profile_case.xml
View file @ faf6db49
...@@ -61,6 +61,14 @@ ...@@ -61,6 +61,14 @@
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="@color/white" /> android:textColor="@color/white" />
<ImageView
android:id="@+id/iv_real_label"
android:layout_width="55dp"
android:layout_height="20dp"
android:layout_marginStart="10dp"
android:src="@mipmap/ic_label_real"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/tv_label_vip" android:id="@+id/tv_label_vip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -76,21 +84,6 @@ ...@@ -76,21 +84,6 @@
android:textSize="12sp" android:textSize="12sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView
android:id="@+id/tv_label_auth"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="@drawable/shape_label_auth"
android:paddingStart="10dp"
android:paddingTop="2dp"
android:paddingEnd="10dp"
android:paddingBottom="2dp"
android:text="真人"
android:textColor="@color/color_159823"
android:textSize="12sp"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -129,7 +122,7 @@ ...@@ -129,7 +122,7 @@
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tv_label_distance" android:id="@+id/tv_label_distance_male"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
...@@ -140,6 +133,19 @@ ...@@ -140,6 +133,19 @@
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:text="172cm" android:text="172cm"
android:textColor="@color/color_E5C565" android:textColor="@color/color_E5C565"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/tv_label_distance_female"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:textColor="@color/white"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
......
video/app/src/main/res/layout/layout_user_profile_head.xml
View file @ faf6db49
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
android:id="@+id/iv_head_back" android:id="@+id/iv_head_back"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginStart="10dp" android:src="@mipmap/ic_profile_back"
android:src="@mipmap/ic_arrow_white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_bar" /> app:layout_constraintTop_toBottomOf="@id/v_bar" />
...@@ -51,20 +50,20 @@ ...@@ -51,20 +50,20 @@
<ImageView <ImageView
android:id="@+id/iv_head_more" android:id="@+id/iv_head_more"
android:layout_width="wrap_content" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:src="@mipmap/ic_label_right" android:src="@mipmap/ic_profile_more"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_bar" /> app:layout_constraintTop_toBottomOf="@id/v_bar" />
<ImageView <ImageView
android:id="@+id/iv_head_share" android:id="@+id/iv_head_share"
android:layout_width="wrap_content" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:src="@mipmap/ic_label_right" android:src="@mipmap/ic_profile_share"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_head_more" app:layout_constraintEnd_toStartOf="@id/iv_head_more"
app:layout_constraintTop_toBottomOf="@id/v_bar" /> app:layout_constraintTop_toBottomOf="@id/v_bar" />
......
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