diff --git a/app/build.gradle b/app/build.gradle index acb284b..c03cc70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.videoplayer" minSdkVersion 24 targetSdkVersion 28 - versionCode 119 - versionName "1.1.9" + versionCode 120 + versionName "1.2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java b/app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java index fd1f2f2..abe5ad9 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java +++ b/app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java @@ -5,6 +5,8 @@ import com.uiui.videoplayer.base.mvvm.BaseViewModel; import com.uiui.videoplayer.databinding.ActivityMainBinding; public class MainViewModel extends BaseViewModel { + private static final String TAG = "MainViewModel"; + @Override public ActivityMainBinding getVDBinding() { return binding; @@ -16,5 +18,4 @@ public class MainViewModel extends BaseViewModel>() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull BaseResponse baseResponse) { + Log.e("getActivationInfo", "onNext: " + baseResponse); + } + + @Override + public void onError(@NonNull Throwable e) { + + } + + @Override + public void onComplete() { + + } + }); + } + } diff --git a/app/src/main/java/com/uiui/videoplayer/bean/ActivationInfo.java b/app/src/main/java/com/uiui/videoplayer/bean/ActivationInfo.java new file mode 100644 index 0000000..0b559e4 --- /dev/null +++ b/app/src/main/java/com/uiui/videoplayer/bean/ActivationInfo.java @@ -0,0 +1,61 @@ +package com.uiui.videoplayer.bean; + +import java.io.Serializable; + +public class ActivationInfo implements Serializable { + + int id; + String sn; + String out_trade_no; + int pay_type; + float total; + String pay_time; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getOut_trade_no() { + return out_trade_no; + } + + public void setOut_trade_no(String out_trade_no) { + this.out_trade_no = out_trade_no; + } + + public int getPay_type() { + return pay_type; + } + + public void setPay_type(int pay_type) { + this.pay_type = pay_type; + } + + public float getTotal() { + return total; + } + + public void setTotal(float total) { + this.total = total; + } + + public String getPay_time() { + return pay_time; + } + + public void setPay_time(String pay_time) { + this.pay_time = pay_time; + } +} diff --git a/app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java index 36287b6..709a60c 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java @@ -13,6 +13,7 @@ import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; import com.trello.rxlifecycle4.android.FragmentEvent; import com.uiui.sn.manager.RemoteManager; +import com.uiui.videoplayer.bean.ActivationInfo; import com.uiui.videoplayer.bean.BaseResponse; import com.uiui.videoplayer.bean.LocalVideoInfo; import com.uiui.videoplayer.bean.PhotoInfo; @@ -23,9 +24,8 @@ import com.uiui.videoplayer.disklrucache.CacheHelper; import com.uiui.videoplayer.gson.GsonUtils; import com.uiui.videoplayer.manager.ConnectManager; import com.uiui.videoplayer.manager.ConnectMode; -import com.uiui.videoplayer.network.api.HomePhotoApi; -import com.uiui.videoplayer.network.api.HomeSpaceInfoApi; -import com.uiui.videoplayer.network.api.HomeVideoApi; +import com.uiui.videoplayer.network.api.ActivationApi; +import com.uiui.videoplayer.network.api.FileApi; import com.uiui.videoplayer.network.interceptor.RepeatRequestInterceptor; import com.uiui.videoplayer.utils.JGYUtils; import com.uiui.videoplayer.utils.ToastUtil; @@ -153,26 +153,33 @@ public class NetInterfaceManager { * */ public Observable>> getHomeVideoControl() { - return mRetrofit.create(HomeVideoApi.class) + return mRetrofit.create(FileApi.class) .getHomeVideo(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getHomePhotoControl() { - return mRetrofit.create(HomePhotoApi.class) + return mRetrofit.create(FileApi.class) .getHomePhoto(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getHomeSpaceInfoControl() { - return mRetrofit.create(HomeSpaceInfoApi.class) + return mRetrofit.create(FileApi.class) .getHomeSpaceInfo(RemoteManager.getInstance().getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } + public Observable> getActivationControl() { + return mRetrofit.create(ActivationApi.class) + .getActivation(RemoteManager.getInstance().getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + public interface onVideoPathCallback { void setVideoList(ArrayList videoList); diff --git a/app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java b/app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java index 9084143..ca701e0 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java +++ b/app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java @@ -10,6 +10,8 @@ public class UrlAddress { public static final String HOME_PHOTO ="File/getHomePhoto"; /*获取家庭空间信息*/ public static final String GET_HOME_SPACE_INFO ="File/getHomeSpaceInfo"; + /*获取设备激活支付信息*/ + public static final String ACTIVATION_INFO = "sn/act-info"; } diff --git a/app/src/main/java/com/uiui/videoplayer/network/api/HomeSpaceInfoApi.java b/app/src/main/java/com/uiui/videoplayer/network/api/ActivationApi.java similarity index 61% rename from app/src/main/java/com/uiui/videoplayer/network/api/HomeSpaceInfoApi.java rename to app/src/main/java/com/uiui/videoplayer/network/api/ActivationApi.java index 2e885f7..af1d2d7 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/api/HomeSpaceInfoApi.java +++ b/app/src/main/java/com/uiui/videoplayer/network/api/ActivationApi.java @@ -1,16 +1,16 @@ package com.uiui.videoplayer.network.api; +import com.uiui.videoplayer.bean.ActivationInfo; import com.uiui.videoplayer.bean.BaseResponse; -import com.uiui.videoplayer.bean.SpaceInfo; import com.uiui.videoplayer.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; import retrofit2.http.Query; -public interface HomeSpaceInfoApi { - @GET(UrlAddress.GET_HOME_SPACE_INFO) - Observable> getHomeSpaceInfo( +public interface ActivationApi { + @GET(UrlAddress.ACTIVATION_INFO) + Observable> getActivation( @Query("sn") String sn ); } diff --git a/app/src/main/java/com/uiui/videoplayer/network/api/HomePhotoApi.java b/app/src/main/java/com/uiui/videoplayer/network/api/FileApi.java similarity index 54% rename from app/src/main/java/com/uiui/videoplayer/network/api/HomePhotoApi.java rename to app/src/main/java/com/uiui/videoplayer/network/api/FileApi.java index 30a4497..348637b 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/api/HomePhotoApi.java +++ b/app/src/main/java/com/uiui/videoplayer/network/api/FileApi.java @@ -2,6 +2,8 @@ package com.uiui.videoplayer.network.api; import com.uiui.videoplayer.bean.BaseResponse; import com.uiui.videoplayer.bean.PhotoInfo; +import com.uiui.videoplayer.bean.SpaceInfo; +import com.uiui.videoplayer.bean.VideoInfo; import com.uiui.videoplayer.network.UrlAddress; import java.util.ArrayList; @@ -11,9 +13,19 @@ import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; import retrofit2.http.Query; -public interface HomePhotoApi { +public interface FileApi { + @GET(UrlAddress.HOME_VIDEO) + Observable>> getHomeVideo( + @Query("sn") String sn + ); + @GET(UrlAddress.HOME_PHOTO) Observable>> getHomePhoto( @Query("sn") String sn ); + + @GET(UrlAddress.GET_HOME_SPACE_INFO) + Observable> getHomeSpaceInfo( + @Query("sn") String sn + ); } diff --git a/app/src/main/java/com/uiui/videoplayer/network/api/HomeVideoApi.java b/app/src/main/java/com/uiui/videoplayer/network/api/HomeVideoApi.java deleted file mode 100644 index 1e20e8b..0000000 --- a/app/src/main/java/com/uiui/videoplayer/network/api/HomeVideoApi.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.uiui.videoplayer.network.api; - -import com.uiui.videoplayer.bean.BaseResponse; -import com.uiui.videoplayer.bean.VideoInfo; -import com.uiui.videoplayer.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface HomeVideoApi { - @GET(UrlAddress.HOME_VIDEO) - Observable>> getHomeVideo( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java b/app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java index 43ddaa4..5dfa705 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java +++ b/app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java @@ -6,7 +6,6 @@ import android.content.Context; import android.os.Bundle; import android.text.TextUtils; import android.view.View; -import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; @@ -36,7 +35,7 @@ public class CustomDialog extends Dialog { /** * 确认和取消按钮 */ - private Button negtiveBn, positiveBn; + private TextView negtiveBn, positiveBn; /** * 按钮之间的分割线 diff --git a/app/src/main/res/layout/custom_dialog.xml b/app/src/main/res/layout/custom_dialog.xml index e64c8f3..03423d0 100644 --- a/app/src/main/res/layout/custom_dialog.xml +++ b/app/src/main/res/layout/custom_dialog.xml @@ -1,19 +1,20 @@ - + android:layout_width="match_parent" + android:layout_height="wrap_content"> + android:paddingTop="8dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:visibility="gone" /> -