Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

韩亚云
2 parents 711a60b8 0011be9e
Showing 12 changed files with 452 additions and 48 deletions
app/strike/src/main/java/com/cnlive/strike/demo/activity/CNplayerActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
app/strike/src/main/res/layout/activity_cnvideo.xml
app/strike/src/main/res/layout/activity_demo_mvp_main.xml
cloud/user/src/main/java/com/cnlive/cloud/user/router/user/CNLiveUserServiceImpl.java
cloud/video/src/main/java/com/libs/video/data/network/HttpRequest.java
cloud/video/src/main/java/com/libs/video/data/network/HttpUtils.java
config.gradle
core/base/src/main/java/com/cnlive/core/libs/base/arouter/RouterConst.java
core/base/src/main/java/com/cnlive/core/libs/base/arouter/user/CNLiveUserService.java
core/base/src/main/java/com/cnlive/core/libs/base/arouter/user/OpenUserInfo.java
core/base/src/main/java/com/cnlive/core/libs/base/util/CheckUtil.java
 package com.cnlive.strike.demo.activity;
+import android.content.Intent;
+
 import androidx.databinding.ViewDataBinding;
 import com.cnlive.cloud.BuildConfig;
@@ -9,6 +11,7 @@ import com.cnlive.cloud.user.auth.UserService;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.ChannelUtil;
+import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
 import com.libs.video.util.Config;
 import com.libs.video.util.ProbeUtil;
 import com.libs.video.video.VideoView;
@@ -18,6 +21,7 @@ public class CNplayerActivity extends BaseActivity implements IMediaPlayer.OnPre
         IMediaPlayer.OnCompletionListener, IMediaPlayer.OnErrorListener, IMediaPlayer.OnInfoListener,
         IMediaPlayer.OnPlayStateListener {
     private ActivityCnvideoBinding binding;
+    private String type = "0";
     @Override
     protected int getBindLayoutId() {
@@ -30,10 +34,15 @@ public class CNplayerActivity extends BaseActivity implements IMediaPlayer.OnPre
     }
     @Override
+    protected void initParams(Intent params) {
+        super.initParams(params);
+        type = params.getStringExtra("type");
+    }
+
+    @Override
     protected void initView() {
         //视讯云配置单
-        ProbeUtil.setSid(UserService.getUid(me));
-
+//        ProbeUtil.setSid(UserService.getUid(me));
         Config.setFromId(ChannelUtil.getChannelFromApk(this));
         Config.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY);
         binding.videoview.setOnPreparedListener(this);
@@ -41,14 +50,33 @@ public class CNplayerActivity extends BaseActivity implements IMediaPlayer.OnPre
         binding.videoview.setOnPlayStateListener(this);
         binding.videoview.setOnErrorListener(this);
         binding.videoview.setOnInfoListener(this);
-        binding.videoview.setDataSource(new DataSource("223_88c98ab1395f4762b703fbdd9d59d2e5", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
-        binding.videoview.setMirror(true);
+        if ("0".equals(type)) {
+            QMUITipDialogUtil.loadingDialog(me,"点播");
+            binding.videoview.setDataSource(new DataSource("223_88c98ab1395f4762b703fbdd9d59d2e5", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+        } else {
+            QMUITipDialogUtil.loadingDialog(me,"直播");
+//            binding.videoview.setDataSource(new DataSource("604_233216be9552476b93d2c0cac7819222", Config.TYPE_LIVE, Config.TYPE_PLAY_RATE_2));
+//            binding.videoview.setDataSource(new DataSource("223_b66053d9eaf147efa58eb1ae4b47661e", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+            binding.videoview.setDataSource(new DataSource("604_75ca27cce3a043b1876f694dd1125234", Config.TYPE_LIVE, Config.TYPE_PLAY_RATE_2));
+
+        }
         binding.videoview.start();
     }
     @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        binding.videoview.stop();
+    }
+
+    @Override
     public boolean onInfo(IMediaPlayer mediaplayer, int what, int extra) {
         return false;
     }
@@ -69,12 +97,13 @@ public class CNplayerActivity extends BaseActivity implements IMediaPlayer.OnPre
     @Override
     public void onPrepared(IMediaPlayer mediaplayer) {
         AlertUtil.showDeftToast(me, "onPrepared");
+        QMUITipDialogUtil.dismessDialog();
         mediaplayer.start();
     }
     @Override
     public void onPlayState(boolean isPlay) {
-        AlertUtil.showDeftToast(me, "onPlayState" + isPlay);
+        AlertUtil.showDeftToast(me, "onPlayState:" + isPlay);
     }
 }
@@ -391,9 +391,19 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
         binding.btnCnPlayer.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(me,CNplayerActivity.class));
+                Intent intent=new Intent(me,CNplayerActivity.class);
+                intent.putExtra("type","0");
+                startActivity(intent);
             }
         });
+        binding.btnLivePlayer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent=new Intent(me,CNplayerActivity.class);
+                intent.putExtra("type","1");
+                startActivity(intent);            }
+        });
+
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -8,7 +8,6 @@
         <com.libs.video.video.VideoView
             android:id="@+id/videoview"
-            android:background="@color/black"
             android:layout_width="match_parent"
             android:layout_height="300dp"></com.libs.video.video.VideoView>
     </LinearLayout>
@@ -97,8 +97,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
-                    android:text="视频" />
-
+                    android:text="点播" />
+                <Button
+                    android:id="@+id/btn_livePlayer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="直播" />
                 <Button
                     android:id="@+id/btn_pay"
                     android:layout_width="match_parent"
+package com.cnlive.cloud.user.router.user;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.core.libs.base.arouter.user.CNLiveUserService;
+import com.cnlive.core.libs.base.arouter.user.OpenUserInfo;
+
+/**
+ * 对上海电商开放信息
+ *
+ * @author ys
+ */
+@Route(path = CNLiveUserService.PATH, name = CNLiveUserService.NAME)
+public class CNLiveUserServiceImpl implements CNLiveUserService {
+
+    @Override
+    public void jumpToLoginActivity(Context context, String s) {
+        ARouter.getInstance().build("/cnmain/LoginActivity")
+                .withString("tagurl", s)
+                .withBoolean("needEntranceBtn", false)//是否需要展示浏览入口按钮
+                .navigation(context);
+    }
+
+    @Override
+    public void jumpToLoginDialog(Context context, String s) {
+        ARouter.getInstance().build("/cnmain/LoginDialogActivity")
+                .withString("tagurl", s)
+                .navigation(context);
+    }
+
+    @Override
+    public void jumpToLoginActivity(Context context) {
+        ARouter.getInstance().build("/cnmain/LoginActivity")
+                .withBoolean("needEntranceBtn", false)//是否需要展示浏览入口按钮
+                .navigation(context);
+    }
+
+    @Override
+    public void jumpToLoginDialog(Context context) {
+        ARouter.getInstance().build("/cnmain/LoginDialogActivity")
+                .navigation(context);
+    }
+
+    @Override
+    public boolean isUserOnline(Context context) {
+//        return !TextUtils.isEmpty(LoginManager.getUserId()) ? true : false;
+        return true;
+    }
+
+    @Override
+    public boolean isUserLogin(Context context) {
+        return !TextUtils.isEmpty(UserService.getUid(context)) ? true : false;
+    }
+
+    @Override
+    public OpenUserInfo getUserInfo(Context context) {
+        OpenUserInfo openUserInfo = null;
+        if (null != UserService.getInstance(context).getAppAccount()) {
+            openUserInfo = new OpenUserInfo();
+            //设置用户id
+            openUserInfo.setUid(UserService.getInstance(context).getAppAccount().getUid());
+            //设置用户昵称
+            openUserInfo.setNickName(UserService.getInstance(context).getAppAccount().getNickName());
+            //设置用户性别
+            openUserInfo.setGender(UserService.getInstance(context).getAppAccount().getGender());
+            //设置用户地区
+            openUserInfo.setLocation(UserService.getInstance(context).getAppAccount().getLocation());
+            //设置用户头像地址
+            openUserInfo.setFaceUrl(UserService.getInstance(context).getAppAccount().getFaceUrl());
+            //设置用户手机号
+            openUserInfo.setMobile(UserService.getInstance(context).getAppAccount().getMobile());
+            //设置用户email
+            openUserInfo.setEmail(UserService.getInstance(context).getAppAccount().getEmail());
+            //设置用户token
+            openUserInfo.setToken(UserService.getInstance(context).getAppAccount().getToken());
+            //设置用户是否是新用户
+            openUserInfo.setNewUser(UserService.getInstance(context).getAppAccount().isNewUser());
+            //设置用户个性签名
+            openUserInfo.setUserSign(UserService.getInstance(context).getAppAccount().getUserSign());
+            //设置用户大图头像地址
+            openUserInfo.setBigFaceUrl(UserService.getInstance(context).getAppAccount().getBigFaceUrl());
+            //设置用户区码
+            openUserInfo.setCountryCode(UserService.getInstance(context).getAppAccount().getCountryCode());
+            //设置用户qqId
+            openUserInfo.setQqUid(UserService.getInstance(context).getAppAccount().getQqUid());
+            //设置用户微信id
+            openUserInfo.setWxUid(UserService.getInstance(context).getAppAccount().getWxUid());
+            //设置用户新浪id
+            openUserInfo.setSinaUid(UserService.getInstance(context).getAppAccount().getSinaUid());
+        }
+        return openUserInfo;
+    }
+
+    @Override
+    public String getUid(Context context) {
+        return !TextUtils.isEmpty(UserService.getUid(context)) ? UserService.getUid(context) : null;
+    }
+
+    @Override
+    public void init(Context context) {
+    }
+}
@@ -88,16 +88,16 @@ public class HttpRequest {
         parames.put("uid", UUIDUtils.getUUID(Config.getContext()));
         parames.put("platform_id", Config.getContext().getPackageName());
         parames.put("timestamp", String.valueOf(HttpUtils.getTime() / 1000));
-        Map<String, String> map = SignUtil.order(parames,false);
+        Map<String, String> map = SignUtil.order(parames, false);
         String signValue = SHA1Util
                 .SHA1Digest(HttpUtils.mapJoin(map, false).concat("&key=").concat(Config.getSpKey()))
                 .toUpperCase(Locale.getDefault());
         map.put("sign", signValue);
-        return getPlayUrl(map, isLive, callback);
+        return getPlayUrl(map, isLive,null, callback);
     }
-    private static Disposable getPlayUrl(Map<String, String> parames, boolean isLive, final NetCallBack<String> callback) {
+    private static Disposable getPlayUrl(Map<String, String> parames, boolean isLive, String backUrl, final NetCallBack<String> callback) {
         NetCallBack<Response<ResponseBody>> result = new NetCallBack<Response<ResponseBody>>() {
             @Override
             public void onRequestState(int state) {
@@ -113,11 +113,12 @@ public class HttpRequest {
                         callback.onSuccess(data.raw().request().url().toString());
                     }
                 } else {
-//                    String backUrl = data.headers().get("Location");
+                    String backUrl = data.headers().get("Location");
 //                    if (null != callback) {
 //                        callback.onSuccess(backUrl);
 //                    }
-                    getPlayUrl(parames, isLive, callback);
+//                    getPlayUrl(parames, isLive, backUrl,callback);
+                    HttpUtils.resolveRedirect(backUrl,callback);
                 }
             }
@@ -126,10 +127,15 @@ public class HttpRequest {
                 callback.onFailure(errCode, errMsg, e);
             }
         };
+        String url=BASE_URL;
+        if (!TextUtils.isEmpty(backUrl)){
+            url=backUrl;
+        }
         //是直播
         if (isLive) {
             return HttpConn.action(
                     VideoRequest.init()
+                            .setUrl(url)
                             .setReadTimeout(60)
                             .setConnectTimeout(60)
                             .setWriteTimeout(60)
@@ -141,6 +147,7 @@ public class HttpRequest {
         else {
             return HttpConn.action(
                     VideoRequest.init()
+                            .setUrl(url)
                             .setReadTimeout(60)
                             .setConnectTimeout(60)
                             .setWriteTimeout(60)
@@ -8,6 +8,7 @@ import android.util.Log;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.UUIDUtils;
+import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.util.SHA1Util;
 import com.libs.video.util.Config;
@@ -89,34 +90,34 @@ public class HttpUtils {
 //
 //    }
-//    //直播播放地址302重定向rtmp播放地址
-//    private static String resolveRedirect(String urlStr) {
-////        Log.i(TAG,"Get "+urlStr);
-//        try {
-//            //创建okHttpClient对象
-//            OkHttpClient mOkHttpClient = new OkHttpClient.Builder()
-//                    .connectTimeout(60 * 1000, TimeUnit.MILLISECONDS)
-//                    .readTimeout(60 * 1000, TimeUnit.MILLISECONDS)
-//                    .writeTimeout(60 * 1000, TimeUnit.MILLISECONDS)
-//                    .build();
-//            //创建一个Request
-//            Request request = new Request.Builder()
-//                    .url(urlStr)
-//                    .build();
-//            //new call
-//            Call call = mOkHttpClient.newCall(request);
-//            //请求加入调度
-//            Response response = call.execute();
-//            String backUrl = response.header("Location");
-//            if (response.code() != HttpURLConnection.HTTP_MOVED_TEMP && response.code() != HttpURLConnection.HTTP_MOVED_PERM) {
-//                return response.request().url().toString();
-//            } else {
-//                return resolveRedirect(backUrl);
-//            }
-//        } catch (Exception e) {
-//            return urlStr;
-//        }
-//    }
+    //直播播放地址302重定向rtmp播放地址
+    public static void resolveRedirect(String urlStr,final NetCallBack<String> callback) {
+//        Log.i(TAG,"Get "+urlStr);
+        try {
+            //创建okHttpClient对象
+            OkHttpClient mOkHttpClient = new OkHttpClient.Builder()
+                    .connectTimeout(60 * 1000, TimeUnit.MILLISECONDS)
+                    .readTimeout(60 * 1000, TimeUnit.MILLISECONDS)
+                    .writeTimeout(60 * 1000, TimeUnit.MILLISECONDS)
+                    .build();
+            //创建一个Request
+            Request request = new Request.Builder()
+                    .url(urlStr)
+                    .build();
+            //new call
+            Call call = mOkHttpClient.newCall(request);
+            //请求加入调度
+            Response response = call.execute();
+            String backUrl = response.header("Location");
+            if (response.code() != HttpURLConnection.HTTP_MOVED_TEMP && response.code() != HttpURLConnection.HTTP_MOVED_PERM) {
+                callback.onSuccess(response.request().url().toString());
+            } else {
+                 resolveRedirect(backUrl,callback);
+            }
+        } catch (Exception e) {
+            callback.onFailure("-1",e.toString(),e);
+        }
+    }
     public interface resolveRedirectCallBack {
         void onSuccess(String result);
@@ -100,12 +100,12 @@ ext {
             rxlifecycle_android     : 'com.trello.rxlifecycle3:rxlifecycle-android:3.1.0',
             rxlifecycle_components  : 'com.trello.rxlifecycle3:rxlifecycle-components:3.1.0',
             //Retrofit
-            retrofit                : 'com.squareup.retrofit2:retrofit:2.6.0',
-            retrofitConverterGson   : 'com.squareup.retrofit2:converter-gson:2.6.0',
-            retrofitAdapterRxjava2  : 'com.squareup.retrofit2:adapter-rxjava2:2.6.0',
+            retrofit                : 'com.squareup.retrofit2:retrofit:2.6.3',
+            retrofitConverterGson   : 'com.squareup.retrofit2:converter-gson:2.6.3',
+            retrofitAdapterRxjava2  : 'com.squareup.retrofit2:adapter-rxjava2:2.6.3',
             //OKhttp
-            okhttp                  : 'com.squareup.okhttp3:okhttp:3.14.2',
-            okhttpLoggingInterceptor: 'com.squareup.okhttp3:logging-interceptor:3.14.2',
+            okhttp                  : 'com.squareup.okhttp3:okhttp:4.2.2',
+            okhttpLoggingInterceptor: 'com.squareup.okhttp3:logging-interceptor:4.2.2',
             //GreenDao
             greendao                : 'org.greenrobot:greendao:3.2.2',
             //兼容旧版
+package com.cnlive.core.libs.base.arouter;
+
+public class RouterConst {
+    public static final String OPEN_USER_SERVICE_PATH = "/Common/UserInfoService";
+    public static final String OPEN_USER_SERVICE_NAME = "UserInfoService";
+
+}
+package com.cnlive.core.libs.base.arouter.user;
+
+import android.content.Context;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+
+/**
+ * 给上海电商 用户库
+ */
+public interface CNLiveUserService extends IProvider {
+    public static final String PATH = "/openService/CNLiveUserService";
+    public static final String NAME = "开放用户信息的服务接口";
+
+    /**
+     * 跳转到登录页
+     *
+     * @param tagUrl 跳转地址
+     */
+    void jumpToLoginActivity(Context context, String tagUrl);
+
+    /**
+     * 跳转到登录对话框
+     *
+     * @param tagUrl 跳转地址
+     */
+    void jumpToLoginDialog(Context context, String tagUrl);
+
+    /**
+     * 跳转到登录页
+     */
+    void jumpToLoginActivity(Context context);
+
+    /**
+     * 跳转到登录对话框
+     */
+    void jumpToLoginDialog(Context context);
+
+    /**
+     * 判断用户是否在线
+     * author ys
+     *
+     * @param context
+     * @return
+     */
+    boolean isUserOnline(Context context);
+
+    /**
+     * 判断用户是否登录
+     * author ys
+     *
+     * @param context
+     * @return
+     */
+    boolean isUserLogin(Context context);
+
+    /**
+     * 获取用户信息
+     * author ys
+     *
+     * @param context
+     * @return
+     */
+    OpenUserInfo getUserInfo(Context context);
+
+    /**
+     * 获取用户id
+     * author ys
+     *
+     * @param context
+     * @return
+     */
+    String getUid(Context context);
+
+}
+package com.cnlive.core.libs.base.arouter.user;
+
+import android.text.TextUtils;
+
+import java.io.Serializable;
+
+/**
+ * 开放平台-用户信息
+ *
+ * @author ys
+ */
+
+public class OpenUserInfo implements Serializable {
+    //用户id
+    private String uid;
+    //昵称
+    private String nickName;
+    //性别
+    private String gender;
+    //地址
+    private String location;
+    //头像
+    private String faceUrl;
+    //手机号
+    private String mobile;
+    //邮箱
+    private String email;
+    //平台TOKEN
+    private String token;
+    //新用户
+    private boolean isNewUser;
+    //个性签名
+    private String userSign;
+    //用户头像大图
+    private String bigFaceUrl;
+    //手机号国家码
+    private String countryCode;
+    //qqid
+    private String qqUid;
+    //微信id
+    private String wxUid;
+    //微博id
+    private String sinaUid;
+
+
+    public String getUid() {
+        return uid == null ? "" : uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getBigFaceUrl() {
+        if (TextUtils.isEmpty(bigFaceUrl)) return faceUrl;
+        return bigFaceUrl;
+    }
+
+    public void setBigFaceUrl(String bigFaceUrl) {
+        this.bigFaceUrl = bigFaceUrl;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public boolean isNewUser() {
+        return isNewUser;
+    }
+
+    public void setNewUser(boolean newUser) {
+        isNewUser = newUser;
+    }
+
+    public String getQqUid() {
+        return qqUid;
+    }
+
+    public void setQqUid(String qqUid) {
+        this.qqUid = qqUid;
+    }
+
+    public String getWxUid() {
+        return wxUid;
+    }
+
+    public void setWxUid(String wxUid) {
+        this.wxUid = wxUid;
+    }
+
+    public String getSinaUid() {
+        return sinaUid;
+    }
+
+    public void setSinaUid(String sinaUid) {
+        this.sinaUid = sinaUid;
+    }
+
+    public String getUserSign() {
+        return userSign;
+    }
+
+    public void setUserSign(String userSign) {
+        this.userSign = userSign;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+}
@@ -136,7 +136,7 @@ public class CheckUtil {
     public static boolean isIgnoringBatteryOptimizationss(Activity context) {
         try {
             String carrier = android.os.Build.MANUFACTURER;
-            if (!"smartisan".equals(carrier)) {
+            if (!"smartisan".equals(carrier)&&!"blackshark".equals(carrier)) {
                 PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
                     boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());