diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt index 59a61040..6ee464dd 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt @@ -8,6 +8,7 @@ import com.xscm.modulemain.activity.user.conacts.HeartCpContact import com.xscm.modulemain.activity.user.presenter.HeartCpPresenter import com.xscm.modulemain.adapter.ItemCpHeartAdapter import com.xscm.modulemain.databinding.ActivityHeartCpBinding +import com.xscm.modulemain.dialog.DialogWebView import com.xscm.modulemain.dialog.RoomAuctionWebViewDialog import com.xscm.moduleutil.base.CommonAppContext import com.xscm.moduleutil.bean.HeartCpBean @@ -50,14 +51,9 @@ class HeartCpActivity : BaseMvpActivity(context) { + + + override fun getLayoutId(): Int { + return R.layout.webview_dialog + } + + override fun initView() { + mBinding.webview.setBackgroundColor(Color.TRANSPARENT) + + + } + + override fun initData() { + mBinding.ivBack.setOnClickListener { + dismiss() + } + } + +/** + * 显示网页内容的方法 + * @param url 要加载的网页URL地址 + */ + fun show(url:String) { + // 调用父类的show方法 + super.show() + // 调用setWebView方法加载指定URL的网页 + setWebView(url) + } + + private fun setWebView(url: String) { + mBinding.webview.getSettings().setJavaScriptEnabled(true) + mBinding.webview.loadUrl(url) + } +} \ No newline at end of file diff --git a/MainModule/src/main/res/layout/room_cp_vip_view.xml b/MainModule/src/main/res/layout/room_cp_vip_view.xml index e08580f1..a551f2fe 100644 --- a/MainModule/src/main/res/layout/room_cp_vip_view.xml +++ b/MainModule/src/main/res/layout/room_cp_vip_view.xml @@ -28,8 +28,7 @@ + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.png new file mode 100644 index 00000000..a0d37a62 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.png new file mode 100644 index 00000000..d7c32214 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.png new file mode 100644 index 00000000..7426a086 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.png differ diff --git a/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java b/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java deleted file mode 100644 index 842d9f99..00000000 --- a/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.qxcm.qxlive.presenter; - - -import android.content.Context; - - -import com.xscm.moduleutil.activity.IPresenter; -import com.xscm.moduleutil.activity.IView; - -import java.lang.ref.Reference; -import java.lang.ref.WeakReference; - -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; - -public abstract class BasePresenter implements IPresenter { - protected CompositeDisposable mDisposables = new CompositeDisposable(); -// private RemoteDataSource api; - protected Reference MvpRef; - protected Context mContext; - - @Deprecated - public BasePresenter(V view) { - attachView(view); - } - - public BasePresenter(V view, Context context) { - attachView(view); - mContext = context; - } - - private void attachView(V view) { - MvpRef = new WeakReference(view); - } - - protected V getView() { - if (MvpRef != null) { - return MvpRef.get(); - } - return null; - } - -// protected RemoteDataSource getApi() { -// if (api == null) { -// api = RemoteDataSource.getInstance(); -// } -// return api; -// } - - /** - * 主要用于判断IView的生命周期是否结束,防止出现内存泄露状况 - * - * @return - */ - public boolean isViewAttach() { - return MvpRef != null && MvpRef.get() != null; - } - - @Override - public void detachView() { - cancelRequest(); - if (MvpRef != null) { - MvpRef.clear(); - MvpRef = null; - } -// if (api != null) { -// api = null; -// } - unBindView(); - } - - - public void unBindView() { - if (MvpRef != null) { - MvpRef.clear(); - } - mContext=null; - } - - /** - * 加入订阅对象 - * - * @param disposable - */ - public void addDisposable(Disposable disposable) { - mDisposables.add(disposable); - } - - /** - * 移除订阅对象 - * - * @param disposable - */ - public void removeDisposable(Disposable disposable) { - mDisposables.remove(disposable); - } - - /** - * 取消所有请求 - */ - public void cancelRequest() { - if (mDisposables != null) { - mDisposables.clear(); // clear时网络请求会随即cancel - mDisposables = null; - } - } - - - -}