Merge remote-tracking branch 'origin/master'

# Conflicts: # app/build.gradle # app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # app/build.gradle # app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
王琳
2 parents 5fc3f722 64901775
Showing 12 changed files with 250 additions and 104 deletions
app/build.gradle
app/src/main/java/com/cnlive/gundam/main/presenter/AnchorInfoPresenter.java
app/src/main/java/com/cnlive/gundam/main/presenter/view/AnchorInfoView.java
app/src/main/java/com/cnlive/gundam/main/presenter/view/IAnchorInfoView.java
app/src/main/java/com/cnlive/gundam/main/ui/activity/MainActivity.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalEditFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/PlayerLiveFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/PlayerVodFragment.java
app/src/main/java/com/cnlive/gundam/video/view/BaseVideoView.java
signing.properties
@@ -3,6 +3,11 @@ apply plugin: &#39;com.android.application&#39;
 android {
     compileSdkVersion 26
     buildToolsVersion "26.0.0"
+
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
+
     defaultConfig {
         applicationId "com.cnlive.gundam"
         minSdkVersion 16
@@ -17,25 +22,38 @@ android {
     }
     signingConfigs {
+        Properties props = new Properties();
+        props.load(new FileInputStream(rootProject.file('signing.properties')))
         myConfig {
-            storeFile file("cnlive_app.jks")
-            storePassword "000000"
-            keyAlias "CNliveApp"
-            keyPassword "000000"
+            v2SigningEnabled false
+            storeFile file(props['KEYSTORE_FILE'])
+            storePassword props['KEYSTORE_PASSWORD']
+            keyAlias props['KEY_ALIAS']
+            keyPassword props['KEY_PASSWORD']
         }
     }
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
             signingConfig signingConfigs.myConfig
+            zipAlignEnabled true
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.myConfig
+            zipAlignEnabled true
         }
     }
+    applicationVariants.all { variant ->
+        def file = variant.outputs[0].outputFile
+        def name = "CNliveApp_" + defaultConfig.versionName + "_" + variant.buildType.name + ".apk";
+        variant.outputs[0].outputFile = new File(file.parent, name)
+    }
+
+
     useLibrary 'org.apache.http.legacy'
 }
@@ -52,8 +70,11 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'org.greenrobot:eventbus:3.0.0'
+
+    //Retrofit
     compile 'com.squareup.retrofit2:retrofit:2.0.2'
     compile 'com.squareup.retrofit2:converter-gson:2.0.2'
+    //OKhttp
     compile 'com.squareup.okhttp3:okhttp:3.2.0'
     compile 'com.squareup.okhttp3:okhttp-ws:3.2.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
@@ -4,11 +4,10 @@ import android.content.Context;
 import com.cnlive.gundam.data.network.RetrofitUtil;
 import com.cnlive.gundam.data.network.util.SignUtil;
-import com.cnlive.gundam.main.presenter.view.AnchorInfoView;
+import com.cnlive.gundam.main.presenter.view.IAnchorInfoView;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.libs.util.Config;
-import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,14 +21,14 @@ import retrofit2.Response;
 public class AnchorInfoPresenter {
-    private WeakReference<AnchorInfoView> viewRef;
+    private IAnchorInfoView view;
-    public AnchorInfoPresenter(AnchorInfoView view) {
-        viewRef = new WeakReference<>(view);
+    public AnchorInfoPresenter(IAnchorInfoView view) {
+        this.view = view;
     }
-    private AnchorInfoView getView(){
-        return viewRef == null ? null : viewRef.get();
+    private IAnchorInfoView getView(){
+        return view;
     }
     /**
      * 查询主播信息
 package com.cnlive.gundam.main.presenter.view;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.support.v4.app.Fragment;
+import android.widget.Toast;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.ui.activity.WebViewActivity;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.ui.activity.StreamActivity;
+import com.cnlive.gundam.user.auth.UserService;
+import com.cnlive.libs.util.Config;
+
+/**
+ * Created by xiansong on 2017/7/10.
+ */
+
+public class AnchorInfoView implements IAnchorInfoView{
+
+    private Activity activity;
+
+    public AnchorInfoView(Activity activity){
+        this.activity = activity;
+    }
+
+    public AnchorInfoView(Fragment fragment){
+        this.activity = fragment != null ? fragment.getActivity() : null;
+    }
+
+    @Override
+    public void onAnchorInfo(ChannelInfoModel info) {
+        switch (info.getData().getStatus()) {
+            case -1:
+                Toast.makeText(activity, "主播不存在", Toast.LENGTH_SHORT).show();
+                showVerifiedDialog();
+                break;
+            case 1:
+                Toast.makeText(activity, "审核中，请耐心等待", Toast.LENGTH_SHORT).show();
+                break;
+            case 2:
+                Toast.makeText(activity, "审核失败", Toast.LENGTH_SHORT).show();
+                break;
+            case 3:
+                Toast.makeText(activity, "开启直播", Toast.LENGTH_SHORT).show();
+                startStreamActivity(info);
+                break;
+            case 4:
+                Toast.makeText(activity, "主播被禁用", Toast.LENGTH_SHORT).show();
+                break;
+        }
+    }
+
+    @Override
+    public void getAnchorFailure() {
+        Toast.makeText(activity, "主播信息认证失败", Toast.LENGTH_LONG).show();
+    }
-public interface AnchorInfoView {
     /**
-     * 获取主播信息成功
+     * 开启直播推流页面
      *
-     * @param channelInfo 主播信息
+     * @param info 主播信息
      */
-    void onAnchorInfo(ChannelInfoModel channelInfo);
+    private void startStreamActivity(ChannelInfoModel info) {
+        String activityId = System.currentTimeMillis() + "";
+        String channelId = info.getData().getChannelId();
+        String channelName = info.getData().getChannelName();
+        String coverImgUrl = info.getData().getCoverImgUrl();
+        StreamActivity.start(activity, activityId, channelId, channelName, coverImgUrl);
+    }
     /**
-     * 获取主播信息失败
+     * 显示主播申请页面
      */
-    void getAnchorFailure();
-}
 \ No newline at end of file
+    private void showVerifiedDialog() {
+        new AlertDialog.Builder(activity)
+                .setMessage("亲，完成实名认证就可以开播啦，现在就去认证吧？")
+                .setPositiveButton("去认证", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                        String channelId = UserService.getInstance(activity).getActiveAccountInfo().getUid() + "";
+                        String base_url = activity.getString(Config.debug ? R.string.debug_verified_url : R.string.verified_url);
+                        String url = String.format(base_url, channelId, Config.getAppId());
+                        Intent intent = new Intent(activity, WebViewActivity.class);
+                        intent.putExtra("url", url);
+                        intent.putExtra("title", "主播认证");
+                        activity.startActivity(intent);
+                    }
+                })
+                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                    }
+                }).show();
+    }
+
+}
+package com.cnlive.gundam.main.presenter.view;
+
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
+
+public interface IAnchorInfoView {
+    /**
+     * 获取主播信息成功
+     *
+     * @param channelInfo 主播信息
+     */
+    void onAnchorInfo(ChannelInfoModel channelInfo);
+
+    /**
+     * 获取主播信息失败
+     */
+    void getAnchorFailure();
+}
 \ No newline at end of file
 package com.cnlive.gundam.main.ui.activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.widget.Toast;
+import android.util.Log;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.ActivityMainBinding;
@@ -18,14 +16,12 @@ import com.cnlive.gundam.main.ui.fragment.LiveFragment;
 import com.cnlive.gundam.main.ui.fragment.UGCListFragment;
 import com.cnlive.gundam.main.ui.widget.FragmentTabHost;
 import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
-import com.cnlive.gundam.stream.model.ChannelInfoModel;
-import com.cnlive.gundam.stream.ui.activity.StreamActivity;
 import com.cnlive.gundam.stream.util.FileUtil;
 import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
 import com.cnlive.gundam.video.view.VideoView;
-import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.ProbeUtil;
 import java.util.Arrays;
@@ -33,7 +29,7 @@ import java.util.Arrays;
  * Created by xiansong on 2017/6/27.
  */
-public class MainActivity extends AppCompatActivity implements FragmentTabHost.OnSetCurrentTabListener, AnchorInfoView {
+public class MainActivity extends AppCompatActivity implements FragmentTabHost.OnSetCurrentTabListener {
     private AnchorInfoPresenter mAnchorInfoPresenter;
@@ -51,8 +47,10 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                 FragmentTabHost.newTab("config", R.layout.indicator_main_mine, ConfigFragment.class)
         ));
-        mAnchorInfoPresenter = new AnchorInfoPresenter(this);
+        mAnchorInfoPresenter = new AnchorInfoPresenter(new AnchorInfoView(this));
+        ProbeUtil.probeSDK("statup");
+        Log.d("MainActivity", "onCreate:");
         //加载水印图片
         FileUtil.copyFile(this, "cnlive_logo.png");
     }
@@ -79,74 +77,6 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
         }
     }
-
-    @Override
-    public void onAnchorInfo(ChannelInfoModel info) {
-        switch (info.getData().getStatus()) {
-            case -1:
-                Toast.makeText(this, "主播不存在", Toast.LENGTH_SHORT).show();
-                showVerifiedDialog();
-                break;
-            case 1:
-                Toast.makeText(this, "审核中，请耐心等待", Toast.LENGTH_SHORT).show();
-                break;
-            case 2:
-                Toast.makeText(this, "审核失败", Toast.LENGTH_SHORT).show();
-                break;
-            case 3:
-                Toast.makeText(this, "开启直播", Toast.LENGTH_SHORT).show();
-                startStreamActivity(info);
-                break;
-            case 4:
-                Toast.makeText(this, "主播被禁用", Toast.LENGTH_SHORT).show();
-                break;
-        }
-    }
-
-    @Override
-    public void getAnchorFailure() {
-        Toast.makeText(this, "主播信息认证失败", Toast.LENGTH_LONG).show();
-    }
-
-    /**
-     * 开启直播推流页面
-     *
-     * @param info 主播信息
-     */
-    private void startStreamActivity(ChannelInfoModel info) {
-        String activityId = System.currentTimeMillis() + "";
-        String channelId = info.getData().getChannelId();
-        String channelName = info.getData().getChannelName();
-        String coverImgUrl = info.getData().getCoverImgUrl();
-        StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl);
-    }
-
-    /**
-     * 显示主播申请页面
-     */
-    private void showVerifiedDialog() {
-        new AlertDialog.Builder(this)
-                .setMessage("亲，完成实名认证就可以开播啦，现在就去认证吧？")
-                .setPositiveButton("去认证", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        dialogInterface.dismiss();
-                        String channelId = UserService.getInstance(MainActivity.this).getActiveAccountInfo().getUid() + "";
-                        String url = String.format(getString(Config.debug ? R.string.debug_verified_url : R.string.verified_url), channelId, Config.getAppId());
-                        Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
-                        intent.putExtra("url", url);
-                        intent.putExtra("title", "主播认证");
-                        startActivity(intent);
-                    }
-                })
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        dialogInterface.dismiss();
-                    }
-                }).show();
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -18,7 +18,10 @@ import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.activity.UserPersonalActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
-
+import com.cnlive.libs.user.IUserService;
+import com.cnlive.libs.user.UserUtil;
+import com.cnlive.libs.user.model.UserData;
+import com.cnlive.libs.util.data.network.Callback;
 /**
  * Created by xiansong on 2017/6/27.
@@ -26,6 +29,7 @@ import com.cnlive.gundam.user.model.User;
 public class ConfigFragment extends Fragment implements View.OnClickListener {
     private UserFragmentBinding binding;
+    private User activeAccountInfo;
     @Nullable
     @Override
@@ -63,7 +67,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 if (uid != 0) {
                     //进入个人中心页面
                     Intent intent = new Intent(getActivity(), UserPersonalActivity.class);
-                    intent.putExtra("isEdit", false);
+                    intent.putExtra("isEdit",false);
                     startActivity(intent);
                 } else {
                     //进入登录页面
@@ -89,13 +93,30 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     }
     private void notifyUI(boolean isLogin) {
-        if (isLogin) {
-            User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+        if(isLogin){
+            activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+            updateUserInfo(activeAccountInfo);
+            activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
             Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
             binding.tvNickname.setText(activeAccountInfo.getNickname());
-        } else {
+        }else{
             Glide.with(getActivity()).load(R.drawable.cnlive_user_header).into(binding.headImg);
             binding.tvNickname.setText(getString(R.string.click_login));
         }
     }
+
+
+
+    private void updateUserInfo(User user) {
+        UserUtil.queryUserInfo(String.valueOf(user.getUid()), String.valueOf(user.getUid()), new Callback() {
+            @Override
+            public void onState(int i, String s, Object obj) {
+                if (i == IUserService.SUCCESS) {
+                    UserData userData = (UserData) obj;
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.setActiveAccountInfo(userData.getData());
+                }
+            }
+        });
+    }
 }
@@ -129,6 +129,10 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
         if (i == IUserService.SUCCESS) {
             updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
+        } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+            UserService userService = UserService.getInstance(getActivity());
+            userService.clearUser();
+            getActivity().finish();
         } else {
             Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
         }
@@ -142,6 +146,10 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
                     UserData userData = (UserData) obj;
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setActiveAccountInfo(userData.getData());
+                } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.clearUser();
+                    getActivity().finish();
                 }
             }
         });
@@ -93,12 +93,17 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
     @Override
     public void onResume() {
         super.onResume();
-        initData();
+        UserService userService = UserService.getInstance(getActivity());
+        user = userService.getActiveAccountInfo();
+        if(user != null && user.getUid() > 0){
+            initData();
+            updateUserInfo();
+        }else{
+            getActivity().finish();
+        }
     }
     private void initData() {
-        UserService userService = UserService.getInstance(getActivity());
-        user = userService.getActiveAccountInfo();
         String gender = user.getGender().equals("f") ? "女" : (user.getGender().equals("m") ? "男" : "未知");
         personalData = new ArrayList<>();
         personalData.add(new PersonalData("头像", user.getFaceurl(), PersonalData.TYPE_HEADER));
@@ -278,6 +283,10 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
         if (i == IUserService.SUCCESS) {
             updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
+        } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+            UserService userService = UserService.getInstance(getActivity());
+            userService.clearUser();
+            getActivity().finish();
         } else {
             Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
         }
@@ -291,7 +300,12 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
                     UserData userData = (UserData) obj;
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setActiveAccountInfo(userData.getData());
+                    user = userService.getActiveAccountInfo();
                     initData();
+                } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.clearUser();
+                    getActivity().finish();
                 }
             }
         });
@@ -18,6 +18,7 @@ import com.cnlive.gundam.video.model.VideoModel;
 import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.view.PlayerAccelerometerSensor;
 import com.cnlive.gundam.video.view.PlayerControllerView;
+import com.cnlive.libs.util.ProbeUtil;
 /**
  * Created by gujun on 2017/6/27.
@@ -66,6 +67,7 @@ public class PlayerLiveFragment extends Fragment implements PlayerAccelerometerS
         if (program == null) return;
         VideoModel model = new VideoModel(program.getTitle(), program.getChannelId(), program.getType(), program.getRates());
         binding.videoView.setVideoInfo(model);
+        ProbeUtil.probeSDK("pgcLiveCount");
     }
     @Override
@@ -88,6 +90,8 @@ public class PlayerLiveFragment extends Fragment implements PlayerAccelerometerS
         super.onPause();
         binding.videoView.onPause();
         playerAccelerometerSensor.unregister();
+
+
     }
     @Override
@@ -17,6 +17,7 @@ import com.cnlive.gundam.video.fragment.chat.CommentFragment;
 import com.cnlive.gundam.video.model.VideoModel;
 import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.view.PlayerAccelerometerSensor;
+import com.cnlive.libs.util.ProbeUtil;
 /**
  * Created by gujun on 2017/4/6.
@@ -61,6 +62,7 @@ public class PlayerVodFragment extends Fragment implements PlayerAccelerometerSe
         program = (VideoListProgram) getArguments().getSerializable("program");
         if (program == null) return;
         VideoModel videoModel = new VideoModel(program.getTitle(), program.getvId(), program.getType(), program.getRates());
+        ProbeUtil.probeSDK("pgcVodCount");//点播播放数量统计
         binding.videoView.setVideoInfo(videoModel);
     }
@@ -16,6 +16,7 @@ import com.cnlive.gundam.databinding.LayoutVideoViewBinding;
 import com.cnlive.gundam.video.model.DataSource;
 import com.cnlive.gundam.video.model.VideoModel;
 import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.ProbeUtil;
 import com.cnlive.libs.util.SharedPreferencesHelper;
 import com.cnlive.libs.video.video.VideoStatusUtil;
 import com.cnlive.libs.video.video.base.IMediaPlayer;
@@ -170,9 +171,13 @@ public abstract class BaseVideoView extends RelativeLayout implements
     public void onDestroy() {
         binding.videoView.releaseSwitchVideo();
+        boolean playing = binding.videoView.isPlaying();
+        if(playing){setPlayState(false);}
         binding.videoView.release();
         VideoStatusUtil.quit();
         saveCurPlayPosition();
+
+
     }
     //保存当前播放视频的播放进度
@@ -197,8 +202,44 @@ public abstract class BaseVideoView extends RelativeLayout implements
      * @param isPlay
      */
     protected void setPlayState(boolean isPlay) {
-        if (isPlay) binding.videoView.start();
-        else binding.videoView.pause();
+        if (isPlay) {
+            if (videoModel.getType().equals(VideoView.TYPE_UGC_LIVE)) {
+                ProbeUtil.probeSDK("ugcLiveStart");
+
+                Log.v("TestDemo","ugcLiveStart");
+
+            } else if (videoModel.getType().equals(VideoView.TYPE_LIVE)) {
+                ProbeUtil.probeSDK("pgcLiveStart");
+
+                Log.v("TestDemo","pgcLiveStart");
+
+            } else if (videoModel.getType().equals(VideoView.TYPE_UGC_VOD)) {
+                ProbeUtil.probeSDK("ugcVodStart");
+
+                Log.v("TestDemo","ugcVodStart");
+
+            }
+            binding.videoView.start();
+        } else {
+            if (videoModel.getType().equals(VideoView.TYPE_UGC_LIVE)) {
+                ProbeUtil.probeSDK("ugcLiveEnd");
+
+                Log.v("TestDemo","ugcLiveEnd");
+
+            } else if (videoModel.getType().equals(VideoView.TYPE_LIVE)) {
+                ProbeUtil.probeSDK("pgcLiveEnd");
+
+                Log.v("TestDemo","pgcLiveEnd");
+
+            } else if (videoModel.getType().equals(VideoView.TYPE_UGC_VOD)) {
+                ProbeUtil.probeSDK("ugcVodEnd");
+
+                Log.v("TestDemo","ugcVodEnd");
+
+            }
+            binding.videoView.pause();
+        }
+
     }
     /**
@@ -229,6 +270,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     @Override
     public void onCompletion(IMediaPlayer iMediaPlayer) {
         isPlay = false;
+        setPlayState(false);
     }
     @Override
+KEYSTORE_FILE=cnlive_app.jks
+KEYSTORE_PASSWORD=000000
+KEY_ALIAS=CNliveApp
+KEY_PASSWORD=000000
 \ No newline at end of file