区分接口地址

朱显松
1 parent ce07866a
Showing 17 changed files with 109 additions and 84 deletions
app/build.gradle
app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/main/network/ApiService.java
app/src/main/java/com/cnlive/gundam/main/network/RetrofitUtil.java
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/ui/activity/MainActivity.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/FragmentTabHost.java
app/src/main/java/com/cnlive/gundam/user/model/ChannelInfoModel.java → app/src/main/java/com/cnlive/gundam/stream/model/ChannelInfoModel.java
app/src/main/java/com/cnlive/gundam/video/adpter/CommonAdapter.java
app/src/main/java/com/cnlive/gundam/video/adpter/GiftAdapter.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
app/src/main/java/com/cnlive/gundam/video/view/BaseVideoView.java
app/src/main/java/com/cnlive/gundam/video/view/PlayerInfoView.java
app/src/main/java/com/cnlive/gundam/video/view/PlayerTouchView.java
app/src/main/java/com/cnlive/gundam/video/view/VideoView.java
app/src/main/res/values/strings.xml
@@ -31,8 +31,13 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.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'
     compile project(':user')
 }
@@ -13,8 +13,6 @@ public class CNLiveApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        //TODO 测试ID 在正式与测试环境均可通过，正式ID则不行~！
-//        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9",true);
-        Config.init(getApplicationContext(), "60_j4faozoq85", "7b6da5a6e2955aaf7f73a06b5bdc6d50e6d5bfda3da86b");
+        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9", true);//测试信息
     }
 }
@@ -3,7 +3,7 @@ package com.cnlive.gundam.main.network;
 import com.cnlive.gundam.main.model.ActiveListModel;
 import com.cnlive.gundam.main.model.ActivePlayInfo;
 import com.cnlive.gundam.main.model.VodListPage;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import java.util.Map;
 package com.cnlive.gundam.main.network;
+
+import com.cnlive.libs.util.Config;
+
 import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -10,14 +14,25 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class RetrofitUtil {
-    private static final String BASE_URL = "http://test.open.cnlive.com/openapi/api2/";
-    public static ApiService getApiService(){
+    private static final String BASE_URL_DEBUG = "http://test.open.cnlive.com/openapi/api2/";
+
+    private static final String BASE_URL_RELEASE = "https://api.cnlive.com/open/api2/";
+
+    public static ApiService getApiService() {
+
+
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl(BASE_URL)
+                .baseUrl(Config.debug ? BASE_URL_DEBUG : BASE_URL_RELEASE)
                 .addConverterFactory(GsonConverterFactory.create())
-                .client(new OkHttpClient())
+                .client(getNewClient())
                 .build();
         return retrofit.create(ApiService.class);
     }
+
+    private static OkHttpClient getNewClient() {
+        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
+        httpLoggingInterceptor.setLevel(Config.debug ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
+        return new OkHttpClient.Builder().addInterceptor(httpLoggingInterceptor).build();
+    }
 }
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.cnlive.gundam.main.network.RetrofitUtil;
 import com.cnlive.gundam.main.network.util.SignUtil;
 import com.cnlive.gundam.main.presenter.view.AnchorInfoView;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.libs.util.Config;
 import java.util.HashMap;
 package com.cnlive.gundam.main.presenter.view;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
 public interface AnchorInfoView {
+    /**
+     * 获取主播信息成功
+     *
+     * @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.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
@@ -18,10 +17,10 @@ import com.cnlive.gundam.main.ui.fragment.HomeFragment;
 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.stream.model.ChannelInfoModel;
 import com.cnlive.gundam.stream.ui.activity.StreamActivity;
 import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.auth.UserService;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
 import com.cnlive.gundam.user.model.User;
 import com.cnlive.libs.util.Config;
@@ -33,8 +32,6 @@ import java.util.Arrays;
 public class MainActivity extends AppCompatActivity implements FragmentTabHost.OnSetCurrentTabListener, AnchorInfoView {
-    private Dialog verifiedDialog;
-
     private AnchorInfoPresenter mAnchorInfoPresenter;
     @Override
@@ -78,8 +75,8 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
     @Override
-    public void onAnchorInfo(ChannelInfoModel model) {
-        switch (model.getData().getStatus()) {
+    public void onAnchorInfo(ChannelInfoModel info) {
+        switch (info.getData().getStatus()) {
             case -1:
                 Toast.makeText(this, "主播不存在", Toast.LENGTH_SHORT).show();
                 showVerifiedDialog();
@@ -92,11 +89,7 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                 break;
             case 3:
                 Toast.makeText(this, "开启直播", Toast.LENGTH_SHORT).show();
-                String activityId = System.currentTimeMillis() + "";
-                String channelId = model.getData().getChannelId();
-                String channelName = model.getData().getChannelName();
-                String coverImgUrl = model.getData().getCoverImgUrl();
-                StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl, false);
+                startStreamActivity(info);
                 break;
             case 4:
                 Toast.makeText(this, "主播被禁用", Toast.LENGTH_SHORT).show();
@@ -106,18 +99,33 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
     @Override
     public void getAnchorFailure() {
-        Toast.makeText(this, getString(R.string.request_state_error), Toast.LENGTH_LONG).show();
+        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, false);
     }
+    /**
+     * 显示主播申请页面
+     */
     private void showVerifiedDialog() {
-        verifiedDialog = new AlertDialog.Builder(this)
+        new AlertDialog.Builder(this)
                 .setMessage("亲，完成实名认证就可以开播啦，现在就去认证吧？")
                 .setPositiveButton("去认证", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        verifiedDialog.dismiss();
+                        dialogInterface.dismiss();
                         String channelId = UserService.getInstance(MainActivity.this).getActiveAccountInfo().getUid() + "";
-                        String url = String.format(getString(R.string.verified_url), channelId, Config.getAppId());
+                        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", "主播认证");
@@ -127,9 +135,8 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        verifiedDialog.dismiss();
+                        dialogInterface.dismiss();
                     }
-                })
-                .show();
+                }).show();
     }
 }
 \ No newline at end of file
@@ -30,7 +30,6 @@ public class FragmentTabHost extends TabHost
         implements TabHost.OnTabChangeListener {
     private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
     private FrameLayout mRealTabContent;
-    private Context mContext;
     private FragmentManager mFragmentManager;
     private int mContainerId;
     private OnSetCurrentTabListener onSetCurrentTabListener;
@@ -45,7 +44,7 @@ public class FragmentTabHost extends TabHost
         boolean onSetCurrentTab(String tag);
     }
-    public static final class TabItemInfo{
+    public static final class TabItemInfo {
         private final String tag;
         private final int layoutId;
         private final Class<?> clss;
@@ -145,14 +144,14 @@ public class FragmentTabHost extends TabHost
         a = context.obtainStyledAttributes(attrs, new int[]{android.R.attr.inflatedId}, 0, 0);
         try {
             mContainerId = a.getResourceId(0, 0);
-        }finally {
+        } finally {
             a.recycle();
         }
         a = context.obtainStyledAttributes(attrs, R.styleable.FragmentTabHost);
         try {
             mDiciderDrawable = a.getDrawable(R.styleable.FragmentTabHost_dividerDrawable);
-        }finally {
+        } finally {
             a.recycle();
         }
         super.setOnTabChangedListener(this);
@@ -188,8 +187,8 @@ public class FragmentTabHost extends TabHost
     /**
      * @deprecated Don't call the original TabHost setup, you must instead
-     * call {@link #setup(Context, FragmentManager)} or
-     * {@link #setup(Context, FragmentManager, int)}.
+     * call {@link #setup( FragmentManager)} or
+     * {@link #setup( FragmentManager, int)}.
      */
     @Override
     @Deprecated
@@ -198,19 +197,17 @@ public class FragmentTabHost extends TabHost
                 "Must call setup() that takes a Context and FragmentManager");
     }
-    public void setup(Context context, FragmentManager manager) {
-        ensureHierarchy(context);  // Ensure views required by super.setup()
+    public void setup(FragmentManager manager) {
+        ensureHierarchy(getContext());  // Ensure views required by super.setup()
         super.setup();
-        mContext = context;
         mFragmentManager = manager;
         ensureContent();
         setDividerDrawable(mDiciderDrawable);
     }
-    public void setup(Context context, FragmentManager manager, int containerId) {
-        ensureHierarchy(context);  // Ensure views required by super.setup()
+    public void setup(FragmentManager manager, int containerId) {
+        ensureHierarchy(getContext());  // Ensure views required by super.setup()
         super.setup();
-        mContext = context;
         mFragmentManager = manager;
         mContainerId = containerId;
         ensureContent();
@@ -226,15 +223,17 @@ public class FragmentTabHost extends TabHost
     /**
      * 设置内容ID并初始化
+     *
      * @param contentId 展示内容的Layout ID
      */
-    public void setContentId(int contentId){
-        FragmentActivity activity = ((FragmentActivity)getContext());
-        setup(activity, activity.getSupportFragmentManager(), contentId);
+    public void setContentId(int contentId) {
+        FragmentActivity activity = ((FragmentActivity) getContext());
+        setup(activity.getSupportFragmentManager(), contentId);
     }
     /**
      * 添加标签内容信息
+     *
      * @param list
      */
     public void setTabItemList(List<TabItemInfo> list) {
@@ -257,7 +256,7 @@ public class FragmentTabHost extends TabHost
     }
     public void addTab(TabHost.TabSpec tabSpec, Class<?> clss, Bundle args) {
-        tabSpec.setContent(new DummyTabFactory(mContext));
+        tabSpec.setContent(new DummyTabFactory(getContext()));
         String tag = tabSpec.getTag();
         TabInfo info = new TabInfo(tag, clss, args);
@@ -391,7 +390,7 @@ public class FragmentTabHost extends TabHost
         this.onSetCurrentTabListener = onSetCurrentTabListener;
     }
-    public void setDividerDrawable(@Nullable Drawable drawable){
+    public void setDividerDrawable(@Nullable Drawable drawable) {
         getTabWidget().setDividerDrawable(drawable);
     }
@@ -417,7 +416,7 @@ public class FragmentTabHost extends TabHost
             }
             if (newTab != null) {
                 if (newTab.fragment == null) {
-                    newTab.fragment = Fragment.instantiate(mContext,
+                    newTab.fragment = Fragment.instantiate(getContext(),
                             newTab.clss.getName(), newTab.args);
                     ft.add(mContainerId, newTab.fragment, newTab.tag);
                 } else {
-package com.cnlive.gundam.user.model;
+package com.cnlive.gundam.stream.model;
 import com.cnlive.gundam.user.model.base.ErrorMessage;
 package com.cnlive.gundam.video.adpter;
-import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
 import android.view.LayoutInflater;
@@ -20,13 +19,11 @@ import java.util.List;
  * @desc ${TODD}
  */
 public class CommonAdapter<T> extends BaseAdapter {
-    private Context mContext;
     private List<T> mDataList;
     private int layoutId; // 条目布局ID
     private int variableId; // DataBinding的变量ID，可通过类似R文件的BR文件来获取
-    public CommonAdapter(Context context, List<T> dataList, int layoutId, int variableId) {
-        this.mContext = context;
+    public CommonAdapter(List<T> dataList, int layoutId, int variableId) {
         this.mDataList = dataList;
         this.layoutId = layoutId;
         this.variableId = variableId;
@@ -52,7 +49,7 @@ public class CommonAdapter&lt;T&gt; extends BaseAdapter {
         ViewDataBinding binding;
         if (convertView == null) {
-            binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), layoutId, parent, false);
+            binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), layoutId, parent, false);
         } else {
             binding = DataBindingUtil.getBinding(convertView);
         }
 package com.cnlive.gundam.video.adpter;
-import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.databinding.ViewDataBinding;
 import android.support.v7.widget.RecyclerView;
@@ -19,24 +18,20 @@ import java.util.List;
  */
 public class GiftAdapter extends RecyclerView.Adapter<GiftAdapter.RVHolder> {
-    private Context mContext;
     private List<GiftModle> mDataList;
     private int mLayoutId;      // 条目布局文件ID
     private int mVariableId;    // DataBinding变量ID
-    public GiftAdapter(Context context, List<GiftModle> list, int layoutId, int variableId) {
-        this.mContext = context;
+    public GiftAdapter(List<GiftModle> list, int layoutId, int variableId) {
         this.mDataList = list;
         this.mLayoutId = layoutId;
         mVariableId = variableId;
-
-
     }
     @Override
     public RVHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        ViewDataBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), mLayoutId, parent, false);
+        ViewDataBinding binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), mLayoutId, parent, false);
         RVHolder holder = new RVHolder(binding.getRoot());
         holder.binding = binding;
         return holder;
@@ -88,6 +88,13 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener {
         initChat();
     }
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        onSendMessageListener = null;
+        onConnectListener = null;
+    }
+
     private void initDate() {
         int[] imaSource = new int[]{R.drawable.porsch_small80, R.drawable.fighter_small80,
                 R.drawable.plane_small80,
@@ -112,7 +119,7 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener {
     private void initMessageAdapter() {
         messageContentArrayList = new ArrayList<>();
         if (messageContentCommonAdapter == null)
-            messageContentCommonAdapter = new CommonAdapter<>(getActivity(), messageContentArrayList, R.layout.item_list_right, BR.user);
+            messageContentCommonAdapter = new CommonAdapter<>(messageContentArrayList, R.layout.item_list_right, BR.user);
     }
     private void initGiftAdapter() {
@@ -120,7 +127,7 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener {
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 2);
         gridLayoutManager.setOrientation(OrientationHelper.HORIZONTAL);
         fragmentChatBinding.recyclerGift.setLayoutManager(gridLayoutManager);
-        fragmentChatBinding.setGiftAdapter(new GiftAdapter(getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
+        fragmentChatBinding.setGiftAdapter(new GiftAdapter(giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
     }
@@ -30,7 +30,6 @@ public abstract class BaseVideoView extends RelativeLayout implements
         IMediaPlayer.OnBufferingUpdateListener, ISwitchVideoView.OnSwitchVideoPreparedListener,
         ISwitchVideoView.OnSwitchVideoErrorListener, ISwitchVideoView.OnSwitchVideoCompleteListener {
-    protected Context mContext;
     protected LayoutVideoViewBinding binding;
     //记录当前视频播放状态
@@ -71,7 +70,6 @@ public abstract class BaseVideoView extends RelativeLayout implements
     public BaseVideoView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        this.mContext = context;
         init();
     }
@@ -81,7 +79,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     protected void init() {
         sharedPreferencesHelper = SharedPreferencesHelper.getInstance(getContext());
-        binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.layout_video_view, this, true);
+        binding = DataBindingUtil.inflate(LayoutInflater.from(getContext()), R.layout.layout_video_view, this, true);
         binding.videoView.setOnPreparedListener(this);
         binding.videoView.setOnInfoListener(this);
         binding.videoView.setOnErrorListener(this);
@@ -138,6 +136,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     }
     public void onDestroy() {
+        binding.videoView.releaseSwitchVideo();
         binding.videoView.release();
         VideoStatusUtil.quit();
         saveCurPlayPosition();
@@ -290,13 +289,13 @@ public abstract class BaseVideoView extends RelativeLayout implements
                     //主播暂时离开
                     canPlay = false;
                     binding.videoView.stop();
-                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, mContext.getString(R.string.player_status_leave));
+                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_leave));
                     break;
                 case IVideoStatus.MEDIA_STATUS_END:
                     //直播结束
                     canPlay = false;
                     binding.videoView.stop();
-                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, mContext.getString(R.string.player_status_end));
+                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_end));
                     break;
             }
@@ -45,9 +45,6 @@ public class PlayerInfoView extends RelativeLayout {
     //展示手机网视图
     public static final int SHOW_MOBILE_NET = 0x2007;
-    private Context mContext;
-
-    private ViewDataBinding binding;
     //存储展示哪个视图
     private ObservableInt observableShowType;
@@ -76,7 +73,6 @@ public class PlayerInfoView extends RelativeLayout {
     public PlayerInfoView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mContext = context;
         init();
     }
@@ -96,7 +92,7 @@ public class PlayerInfoView extends RelativeLayout {
     public void setInfoViewLayout(int infoType) {
         switch (infoType) {
             case VIDEO_INFO_NORMAL:
-                binding = DataBindingUtil.bind(getView(R.layout.layout_player_info));
+                ViewDataBinding binding = DataBindingUtil.bind(getView(R.layout.layout_player_info));
                 binding.setVariable(BR.playerInfoView, this);
                 binding.setVariable(BR.showType, observableShowType);
                 binding.setVariable(BR.isNews, observableIsNews);
@@ -122,7 +118,7 @@ public class PlayerInfoView extends RelativeLayout {
     //获取对应布局的视图
     private View getView(int layout) {
-        View view = LayoutInflater.from(mContext).inflate(layout, null, false);
+        View view = LayoutInflater.from(getContext()).inflate(layout, null, false);
         if (getChildCount() > 0)
             removeAllViews();
         addView(view);
@@ -169,9 +165,9 @@ public class PlayerInfoView extends RelativeLayout {
                 break;
             case R.id.back:
                 if (!PlayerUtils.isPortrait(getContext()) && !isUgc) {
-                    ((Activity) mContext).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                    ((Activity) getContext()).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                 } else {
-                    ((Activity) mContext).onBackPressed();
+                    ((Activity) getContext()).onBackPressed();
                 }
                 break;
             case R.id.playByMobileNet:
@@ -29,7 +29,6 @@ import com.cnlive.gundam.video.utils.PlayerUtils;
 public class PlayerTouchView extends RelativeLayout {
     private VideoTouchListener l;
-    private static Context mContext;
     //点下时的x坐标
     private int downX;
@@ -76,7 +75,6 @@ public class PlayerTouchView extends RelativeLayout {
     public PlayerTouchView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        this.mContext = context;
         audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.layout_player_touch, this, true);
         binding.setLeftAreaMove(leftArea);
@@ -104,11 +102,11 @@ public class PlayerTouchView extends RelativeLayout {
                 if (downX < controlAreaWidth) {
                     if (preVolume == -1)
                         preVolume = getSystemVolume();
-                    brightnessAndVolumeProgress.set(preVolume * DensityUtils.dp2px(mContext, 93) / getSystemMaxVolume());
+                    brightnessAndVolumeProgress.set(preVolume * DensityUtils.dp2px(getContext(), 93) / getSystemMaxVolume());
                 } else if (downX > getWidth() - controlAreaWidth) {
                     if (preBrightness == -1)
                         preBrightness = getSystemBrightness();
-                    brightnessAndVolumeProgress.set(preBrightness * DensityUtils.dp2px(mContext, 93) / 255);
+                    brightnessAndVolumeProgress.set(preBrightness * DensityUtils.dp2px(getContext(), 93) / 255);
                 }
                 curBrightnessProgress = -1;
                 curVolumeProgress = -1;
@@ -190,7 +188,7 @@ public class PlayerTouchView extends RelativeLayout {
         int curBrightness = PlayerUtils.checkSize(preBrightness + moveY * 255 / getHeight(), 1, 255);
         if (curBrightnessProgress == curBrightness) return;
-        int progress = curBrightness * DensityUtils.dp2px(mContext, 93) / 255;
+        int progress = curBrightness * DensityUtils.dp2px(getContext(), 93) / 255;
         brightnessAndVolumeProgress.set(progress);
         curBrightnessProgress = curBrightness;
@@ -237,7 +235,7 @@ public class PlayerTouchView extends RelativeLayout {
         int curVolume = PlayerUtils.checkSize(preVolume + (moveY * getSystemMaxVolume() / getHeight()), 0, getSystemMaxVolume());
         if (curVolumeProgress == curVolume) return;
-        int progress = curVolume * DensityUtils.dp2px(mContext, 93) / getSystemMaxVolume();
+        int progress = curVolume * DensityUtils.dp2px(getContext(), 93) / getSystemMaxVolume();
         brightnessAndVolumeProgress.set(progress);
         curVolumeProgress = curVolume;
@@ -109,7 +109,7 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
         observableIsUgc = new ObservableBoolean();
         observableVideoHeight = new ObservableInt();
         observableVideoWidth = new ObservableInt();
-        observableVideoHeight.set((int) mContext.getResources().getDimension(R.dimen.videoPortraitHeight));
+        observableVideoHeight.set((int) getContext().getResources().getDimension(R.dimen.videoPortraitHeight));
         observableVideoWidth.set(ViewGroup.LayoutParams.MATCH_PARENT);
         observableIsPortrait.set(PlayerUtils.isPortrait(getContext()));
         binding.setVideoPortraitHeight(observableVideoHeight);
@@ -36,6 +36,7 @@
     <string name="request_null">暂无数据</string>
     <string name="request_state_error">获取活动状态失败</string>
     <string name="request_state_play_error">此活动状态无法播放</string>
-    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
+    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
+    <string name="debug_verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s&amp;type=0 </string>
 </resources>