add drop resource

@@ -16,7 +16,10 @@ android {
     }
     }
     buildTypes {
     buildTypes {
         release {
         release {
+            //是否混淆
             minifyEnabled false
             minifyEnabled false
+            zipAlignEnabled true
+//            shrinkResources true//去除无用的resource文件，第一次使用
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         }
     }
     }
@@ -32,7 +35,6 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     })
-    compile project(':xdy')
     compile files('libs/pldroid-player-1.5.1.jar')
     compile files('libs/pldroid-player-1.5.1.jar')
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.jakewharton:butterknife:8.5.1'
     compile 'com.jakewharton:butterknife:8.5.1'
@@ -43,15 +45,16 @@ dependencies {
     compile 'org.kymjs.kjframe:kjframe:2.6'
     compile 'org.kymjs.kjframe:kjframe:2.6'
     compile 'io.reactivex:rxjava:1.0.9'
     compile 'io.reactivex:rxjava:1.0.9'
     compile 'io.reactivex:rxandroid:0.24.0'
     compile 'io.reactivex:rxandroid:0.24.0'
-    compile 'com.squareup.retrofit:retrofit:1.9.0'
+//    compile 'com.squareup.retrofit:retrofit:1.9.0'
     compile 'com.nineoldandroids:library:2.4.0'
     compile 'com.nineoldandroids:library:2.4.0'
     compile 'me.yokeyword:fragmentation:0.10.3'
     compile 'me.yokeyword:fragmentation:0.10.3'
     compile 'com.qiniu:happy-dns:0.2.+'
     compile 'com.qiniu:happy-dns:0.2.+'
-    compile 'com.android.support:support-v4:25.3.1'
+//    compile 'com.android.support:support-v4:25.3.1'
     testCompile 'junit:junit:4.12'
     testCompile 'junit:junit:4.12'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
     compile 'com.qiniu:happy-dns:0.2.+'
     compile 'com.qiniu:happy-dns:0.2.+'
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
     compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
     compile project(':iOS_Dialog_Library')
     compile project(':iOS_Dialog_Library')
+    compile project(':xdy')
 }
 }

@@ -15,3 +15,10 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #   public *;
 #}
 #}
+
+-keep class com.eventhandle.**{*;}
+-keep class com.ntjbase.**{*;}
+-keep class com.videoengine.**{*;}
+-keep class com.voiceengine.**{*;}
+
+-keep class com.mang.xdy.**{*;}

-package com.mang.xdy.demo;
+package com.mang.xuedianyun.android;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.InstrumentationRegistry;

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mang.xdy.demo">
+    package="com.mang.xuedianyun.android">
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -36,13 +36,13 @@
 
 
 
 
     <application
     <application
-        android:name=".application.XdyApplicaiton"
+        android:name="com.mang.xuedianyun.android.application.XdyApplicaiton"
         android:allowBackup="true"
         android:allowBackup="true"
         android:icon="@mipmap/logo"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity"
+        <activity android:name="com.mang.xuedianyun.android.MainActivity"
             android:windowSoftInputMode="adjustPan|stateHidden"
             android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait">
             android:screenOrientation="portrait">
             <intent-filter>
             <intent-filter>
@@ -51,10 +51,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
-        <activity android:name=".activity.VideoPlayActivity"
+        <activity android:name="com.mang.xuedianyun.android.activity.VideoPlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden"
             >
             >
         </activity>
         </activity>
     </application>
     </application>

-package com.mang.xdy.demo;
+package com.mang.xuedianyun.android;
 
 
-import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.TextUtils;
@@ -13,9 +11,9 @@ import android.widget.RelativeLayout;
 
 
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 
 
-import com.mang.xdy.demo.activity.VideoPlayActivity;
-import com.mang.xdy.demo.bean.JoinClassBean;
-import com.mang.xdy.demo.utils.ToastUtil;
+import com.mang.xuedianyun.android.activity.VideoPlayActivity;
+import com.mang.xuedianyun.android.bean.JoinClassBean;
+import com.mang.xuedianyun.android.utils.ToastUtil;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 
 

-package com.mang.xdy.demo.activity;
+package com.mang.xuedianyun.android.activity;
 
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Message;
 import android.support.design.widget.TabLayout;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.content.PermissionChecker;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.DisplayMetrics;
@@ -29,6 +34,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 
 import com.flyco.tablayout.SlidingTabLayout;
 import com.flyco.tablayout.SlidingTabLayout;
 import com.flyco.tablayout.listener.OnTabSelectListener;
 import com.flyco.tablayout.listener.OnTabSelectListener;
@@ -37,21 +43,21 @@ import com.mang.xdy.bean.VideoPlayBean;
 import com.mang.xdy.cache.ACache;
 import com.mang.xdy.cache.ACache;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.core.XdySdk;
 import com.mang.xdy.core.XdySdk;
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.adapter.SimpleFragmentPagerAdapter;
-import com.mang.xdy.demo.bean.ErrorEntity;
-import com.mang.xdy.demo.bean.InitClassSuccessEntity;
-import com.mang.xdy.demo.bean.JoinClass;
-import com.mang.xdy.demo.bean.ProcessVideoOrAudioByTeacherEntity;
-import com.mang.xdy.demo.bean.ResponseEntity;
-import com.mang.xdy.demo.bean.TimeEntity;
-import com.mang.xdy.demo.bean.VideoOrAudioStopEntity;
-import com.mang.xdy.demo.fragment.ChatFragment;
-import com.mang.xdy.demo.fragment.DocFragment;
-import com.mang.xdy.demo.utils.JsonUtil;
-import com.mang.xdy.demo.utils.ToastUtil;
-import com.mang.xdy.demo.widget.dialog.LoginDialog;
-import com.mang.xdy.demo.widget.view.NoScrollViewPager;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.adapter.SimpleFragmentPagerAdapter;
+import com.mang.xuedianyun.android.bean.ErrorEntity;
+import com.mang.xuedianyun.android.bean.InitClassSuccessEntity;
+import com.mang.xuedianyun.android.bean.JoinClass;
+import com.mang.xuedianyun.android.bean.ProcessVideoOrAudioByTeacherEntity;
+import com.mang.xuedianyun.android.bean.ResponseEntity;
+import com.mang.xuedianyun.android.bean.TimeEntity;
+import com.mang.xuedianyun.android.bean.VideoOrAudioStopEntity;
+import com.mang.xuedianyun.android.fragment.ChatFragment;
+import com.mang.xuedianyun.android.fragment.DocFragment;
+import com.mang.xuedianyun.android.utils.JsonUtil;
+import com.mang.xuedianyun.android.utils.ToastUtil;
+import com.mang.xuedianyun.android.widget.dialog.LoginDialog;
+import com.mang.xuedianyun.android.widget.view.NoScrollViewPager;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.utils.SPUtil;
 import com.mang.xdy.utils.SPUtil;
 import com.mang.xdy.utils.UIUtils;
 import com.mang.xdy.utils.UIUtils;
@@ -68,13 +74,14 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Locale;
 
 
 import butterknife.BindView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.ButterKnife;
 import zhangphil.iosdialog.widget.ActionSheetDialog;
 import zhangphil.iosdialog.widget.ActionSheetDialog;
-import com.mang.xdy.demo.widget.dialog.AnswerSheetDialog;
+import com.mang.xuedianyun.android.widget.dialog.AnswerSheetDialog;
 
 
 import static com.pili.pldroid.player.AVOptions.KEY_DELAY_OPTIMIZATION;
 import static com.pili.pldroid.player.AVOptions.KEY_DELAY_OPTIMIZATION;
 
 
@@ -88,8 +95,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
     FrameLayout fra_videoPlay_start;
     FrameLayout fra_videoPlay_start;
     @BindView(R.id.viewpager)
     @BindView(R.id.viewpager)
     NoScrollViewPager viewPager;
     NoScrollViewPager viewPager;
-//    @BindView(R.id.fra_videoPlay_answer)
-//    FrameLayout fraVideoPlayAnswer;
+
     private TabLayout tabLayout;
     private TabLayout tabLayout;
     @BindView(R.id.surfaceview_playVideo)
     @BindView(R.id.surfaceview_playVideo)
     SurfaceView surfaceviewPlayVideo;
     SurfaceView surfaceviewPlayVideo;
@@ -99,6 +105,8 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
     SurfaceView surfaceView_publish;
     SurfaceView surfaceView_publish;
     @BindView(R.id.img_playVideo_replay)
     @BindView(R.id.img_playVideo_replay)
     PLVideoTextureView mVideoView;
     PLVideoTextureView mVideoView;
+    @BindView(R.id.img_playVideo_pushreplay)
+    PLVideoTextureView mPushVideoView;
     @BindView(R.id.img_videoPlay_back)
     @BindView(R.id.img_videoPlay_back)
     ImageView mImage_Back;
     ImageView mImage_Back;
     @BindView(R.id.tv_videoPlay_className)
     @BindView(R.id.tv_videoPlay_className)
@@ -107,6 +115,8 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
     SlidingTabLayout mSlidingTab;
     SlidingTabLayout mSlidingTab;
     @BindView(R.id.img_playVideo_publishAudio)
     @BindView(R.id.img_playVideo_publishAudio)
     ImageView mIamgeView_PublishAudio;
     ImageView mIamgeView_PublishAudio;
+    @BindView(R.id.ll_videoPlay_back)
+    LinearLayout mLinearLayoutBack;
 //    @BindView(R.id.asv_videoPlay_answer)
 //    @BindView(R.id.asv_videoPlay_answer)
 //    AnswerSheetView mAnswerSheetView;
 //    AnswerSheetView mAnswerSheetView;
     private String username = "";
     private String username = "";
@@ -133,13 +143,14 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
     private String className;
     private String className;
     /*课堂类型*/
     /*课堂类型*/
     private int classType = 2;
     private int classType = 2;
+
     private String[] titles;
     private String[] titles;
 
 
     private long loging_upload=0;
     private long loging_upload=0;
 
 
     private LinearLayout llVideo_table_chat;
     private LinearLayout llVideo_table_chat;
 
 
-
+    private final int CAMERA_REQUEST_CODE = 1;
 //    private Fragment mFragment_Tablet_Chat;
 //    private Fragment mFragment_Tablet_Chat;
 
 
     private Handler mmHandler = new Handler() {
     private Handler mmHandler = new Handler() {
@@ -169,7 +180,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                     String userJson = responseEntity.getParam();
                     String userJson = responseEntity.getParam();
                     SPUtil.putString(VideoPlayActivity.this, Constants.CLASS_JOIN_SUCCESS, userJson);
                     SPUtil.putString(VideoPlayActivity.this, Constants.CLASS_JOIN_SUCCESS, userJson);
                     JSONObject jsonObject = null;
                     JSONObject jsonObject = null;
-
                     try {
                     try {
                         jsonObject = new JSONObject(userJson);
                         jsonObject = new JSONObject(userJson);
                         seek = jsonObject.optLong("recordPlaybackMaxTime");
                         seek = jsonObject.optLong("recordPlaybackMaxTime");
@@ -274,6 +284,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
         if (!replay) {
         if (!replay) {
             mVideoView.setVisibility(View.GONE);
             mVideoView.setVisibility(View.GONE);
             mMediaContainer.setVisibility(View.GONE);
             mMediaContainer.setVisibility(View.GONE);
+//            mPushVideoView.setVisibility(View.GONE);
 //            mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
 //            mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
         } else {
         } else {
             surfaceviewPlayVideo.setVisibility(View.GONE);
             surfaceviewPlayVideo.setVisibility(View.GONE);
@@ -303,35 +314,16 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                 }else {
                 }else {
                     showSelectPublishMode();
                     showSelectPublishMode();
                 }
                 }
-//                AnswerSheetDialog answerSheetDialog=  new AnswerSheetDialog(VideoPlayActivity.this);
-//                answerSheetDialog.builder().show();
-//                new AnswerSheetDialog(VideoPlayActivity.this).builder().show();
-//                new AnswText(VideoPlayActivity.this).builder().show();
-//                new AnswerSheetDialog(VideoPlayActivity.this).builder().show();
-//                mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
-//                fra_videoPlay_start.setVisibility(View.GONE);
-//                surfaceView_publish.setVisibility(View.VISIBLE);
-//                fra_videoPlay_start.setEnabled(false);
-//                mFramenLayout_stopPublish.setEnabled(true);
-//                sh = surfaceView_publish.getHolder();
-//                sh.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-//                surfaceView_publish.setZOrderMediaOverlay(true);
-//                xdySdk.api("publishVideo", "", surfaceView_publish, VideoPlayActivity.this);
-//                isPlayVideoMode=true;
 
 
             }
             }
         });
         });
-        mImage_Back.setOnClickListener(new View.OnClickListener() {
+        mLinearLayoutBack.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
                 exit_dialog();
                 exit_dialog();
             }
             }
         });
         });
         //TODO
         //TODO
-
-//        getWindow().setFormat(PixelFormat.TRANSLUCENT);
-//        mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE);
-//        mAnswerSheetView.startCountTimerAndResizeLayout(22);
     }
     }
 
 
 //    public void setTablayout() {
 //    public void setTablayout() {
@@ -355,17 +347,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                             @Override
                             @Override
                             public void onClick(int which) {
                             public void onClick(int which) {
                                 //填写事件
                                 //填写事件
-//                                coverStudent(true);
-//                                mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
-//                                fra_videoPlay_start.setVisibility(View.GONE);
-//                                surfaceView_publish.setVisibility(View.VISIBLE);
-//                                fra_videoPlay_start.setEnabled(false);
-//                                mFramenLayout_stopPublish.setEnabled(true);
-//                                sh = surfaceView_publish.getHolder();
-//                                sh.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-//                                surfaceView_publish.setZOrderMediaOverlay(true);
-//                                xdySdk.api("publishVideo", "", surfaceView_publish, VideoPlayActivity.this);
-//                                isPublsishVideoMode = true;
                                 publishVideo();
                                 publishVideo();
                             }
                             }
                         })
                         })
@@ -374,15 +355,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                             @Override
                             @Override
                             public void onClick(int which) {
                             public void onClick(int which) {
                                 //填写事件
                                 //填写事件
-//                                coverStudent(true);
-//                                mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
-//                                fra_videoPlay_start.setVisibility(View.GONE);
-//                                surfaceView_publish.setVisibility(View.GONE);
-//                                mIamgeView_PublishAudio.setVisibility(View.VISIBLE);
-//                                fra_videoPlay_start.setEnabled(false);
-//                                mFramenLayout_stopPublish.setEnabled(true);
-//                                xdySdk.api(Constants.PUBLISH_AUDIO, "", null, VideoPlayActivity.this);
-//                                isPublsishVideoMode = false;
                                 publishAudio();
                                 publishAudio();
                             }
                             }
                         })
                         })
@@ -402,22 +374,22 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
 
 
                             }
                             }
                         })
                         })
-                .addSheetItem("对错选择", ActionSheetDialog.SheetItemColor.Blue
-                        , new ActionSheetDialog.OnSheetItemClickListener() {
-                            @Override
-                            public void onClick(int which) {
-                                //填写事件
-//                                mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_RIGHT_OR_WRONG);
-//                                mAnswerSheetView.startCountTimerAndResizeLayout(15);
-//                                setAnswerSheetLayout_Nornal(53);
-
-                                AnswerSheetDialog answerSheetDialog=  new AnswerSheetDialog(VideoPlayActivity.this);
-                                answerSheetDialog.builder().show();
-                                answerSheetDialog.selectAnswerSheetType(2);
-                                answerSheetDialog.startCountTimerAndResizeLayout(30,60);
-
-                            }
-                        })
+//                .addSheetItem("对错选择", ActionSheetDialog.SheetItemColor.Blue
+//                        , new ActionSheetDialog.OnSheetItemClickListener() {
+//                            @Override
+//                            public void onClick(int which) {
+//                                //填写事件
+////                                mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_RIGHT_OR_WRONG);
+////                                mAnswerSheetView.startCountTimerAndResizeLayout(15);
+////                                setAnswerSheetLayout_Nornal(53);
+//
+//                                AnswerSheetDialog answerSheetDialog=  new AnswerSheetDialog(VideoPlayActivity.this);
+//                                answerSheetDialog.builder().show();
+//                                answerSheetDialog.selectAnswerSheetType(2);
+//                                answerSheetDialog.startCountTimerAndResizeLayout(30,60);
+//
+//                            }
+//                        })
 //                .addSheetItem("填空题", ActionSheetDialog.SheetItemColor.Blue
 //                .addSheetItem("填空题", ActionSheetDialog.SheetItemColor.Blue
 //                        , new ActionSheetDialog.OnSheetItemClickListener() {
 //                        , new ActionSheetDialog.OnSheetItemClickListener() {
 //                            @Override
 //                            @Override
@@ -529,12 +501,12 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
 //        progressDialogDismiss();
 //        progressDialogDismiss();
 
 
         if (replay) {
         if (replay) {
-            playRecord(response);
+            playRecord(response,false);
 
 
         } else {
         } else {
-            if (!checkPermission()) {
-                return;
-            }
+//            if (!checkPermission()) {
+//                return;
+//            }
 
 
             DisplayMetrics dm = new DisplayMetrics();
             DisplayMetrics dm = new DisplayMetrics();
             getWindowManager().getDefaultDisplay().getMetrics(dm);
             getWindowManager().getDefaultDisplay().getMetrics(dm);
@@ -584,13 +556,11 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
     public void playAudio(String response) {
     public void playAudio(String response) {
 
 
         if (replay) {
         if (replay) {
-            playRecord(response);
-            img_playVideo_novideo.setImageResource(R.mipmap.audio_mode);
-            img_playVideo_novideo.setVisibility(View.VISIBLE);
+            playRecord(response,true);
+//            img_playVideo_novideo.setImageResource(R.mipmap.audio_mode);
+//            img_playVideo_novideo.setVisibility(View.VISIBLE);
         } else {
         } else {
-            if (!checkPermission()) {
-                return;
-            }
+
             xdySdk.api("playAudio", response, null, VideoPlayActivity.this);
             xdySdk.api("playAudio", response, null, VideoPlayActivity.this);
             img_playVideo_novideo.setImageResource(R.mipmap.audio_mode);
             img_playVideo_novideo.setImageResource(R.mipmap.audio_mode);
             img_playVideo_novideo.setVisibility(View.VISIBLE);
             img_playVideo_novideo.setVisibility(View.VISIBLE);
@@ -768,6 +738,9 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
         if (mVideoView != null) {
         if (mVideoView != null) {
             mVideoView.stopPlayback();
             mVideoView.stopPlayback();
         }
         }
+        if(mPushVideoView!=null){
+            mPushVideoView.stopPlayback();
+        }
         UIUtils.closeDialog(mLoginDialog);
         UIUtils.closeDialog(mLoginDialog);
         if (!replay) {
         if (!replay) {
             xdySdk.removeAll();
             xdySdk.removeAll();
@@ -821,7 +794,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
             VideoOrAudioStopEntity entity = JsonUtil.parseJsonToBean(response, VideoOrAudioStopEntity.class);
             VideoOrAudioStopEntity entity = JsonUtil.parseJsonToBean(response, VideoOrAudioStopEntity.class);
             if (entity != null) {
             if (entity != null) {
                 if (xdySdk.onPlayStop(entity.getMediaId() + "")) {
                 if (xdySdk.onPlayStop(entity.getMediaId() + "")) {
-                    img_playVideo_novideo.setImageResource(R.mipmap.novideo);
+                    img_playVideo_novideo.setImageResource(R.mipmap.no_video);
                     img_playVideo_novideo.setVisibility(View.VISIBLE);
                     img_playVideo_novideo.setVisibility(View.VISIBLE);
                 }
                 }
             }
             }
@@ -888,9 +861,45 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
 //        } catch (Exception e) {
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //            e.printStackTrace();
 //        }
 //        }
+
+
+//        try {
+//            if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
+//                    != PackageManager.PERMISSION_GRANTED) {
+//                // 第一次请求权限时，用户如果拒绝，下一次请求shouldShowRequestPermissionRationale()返回true
+//                // 向用户解释为什么需要这个权限
+//                if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
+//
+//                } else {
+//                    //申请相机权限
+//                    ActivityCompat.requestPermissions(this,
+//                            new String[]{Manifest.permission.CAMERA}, CAMERA_REQUEST_CODE);
+//                }
+//            }
+//        }catch ( Exception e){
+//
+//        }
         return true;
         return true;
     }
     }
 
 
+    private void requestPermission() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED) {
+            // 第一次请求权限时，用户如果拒绝，下一次请求shouldShowRequestPermissionRationale()返回true
+            // 向用户解释为什么需要这个权限
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
+
+            } else {
+                //申请相机权限
+                ActivityCompat.requestPermissions(this,
+                        new String[]{Manifest.permission.CAMERA}, CAMERA_REQUEST_CODE);
+            }
+        } else {
+//            tvPermissionStatus.setTextColor(Color.GREEN);
+//            tvPermissionStatus.setText("相机权限已申请");
+        }
+    }
+
     @Override
     @Override
     public void observerUpData(String type, String parameter) {
     public void observerUpData(String type, String parameter) {
         XdyLogUtil.e(TAG + "observer:", Thread.currentThread().getId() + "type:" + type);
         XdyLogUtil.e(TAG + "observer:", Thread.currentThread().getId() + "type:" + type);
@@ -901,9 +910,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
     }
     }
 
 
 
 
-    /***************************************
-     * 回放
-     ***************************************************/
+    /**************************************** 回放***************************************************/
     private static final int FADE_OUT = 1;
     private static final int FADE_OUT = 1;
     private static final int SHOW_PROGRESS = 2;
     private static final int SHOW_PROGRESS = 2;
     private boolean mShowing;
     private boolean mShowing;
@@ -948,12 +955,18 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
             }
             }
         }
         }
     };
     };
-
     public void initReplay() {
     public void initReplay() {
         mVideoView.setOnInfoListener(this);
         mVideoView.setOnInfoListener(this);
         mVideoView.setOnErrorListener(this);
         mVideoView.setOnErrorListener(this);
         mVideoView.setOnSeekCompleteListener(mOnSeekCompleteListener);
         mVideoView.setOnSeekCompleteListener(mOnSeekCompleteListener);
         mVideoView.setDisplayAspectRatio(PLVideoView.ASPECT_RATIO_PAVED_PARENT);
         mVideoView.setDisplayAspectRatio(PLVideoView.ASPECT_RATIO_PAVED_PARENT);
+
+
+        mPushVideoView.setOnInfoListener(this);
+        mPushVideoView.setOnErrorListener(this);
+        mPushVideoView.setOnSeekCompleteListener(mOnSeekCompleteListener);
+        mPushVideoView.setDisplayAspectRatio(PLVideoView.ASPECT_RATIO_PAVED_PARENT);
+
         AVOptions options = new AVOptions();
         AVOptions options = new AVOptions();
         mSeekBar.setOnSeekBarChangeListener(mSeekListener);
         mSeekBar.setOnSeekBarChangeListener(mSeekListener);
 
 
@@ -985,11 +998,11 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
         }
         }
 // 默认的缓存大小，单位是 ms
 // 默认的缓存大小，单位是 ms
 // 默认值是：2000
 // 默认值是：2000
-        options.setInteger(AVOptions.KEY_CACHE_BUFFER_DURATION, 300);
+        options.setInteger(AVOptions.KEY_CACHE_BUFFER_DURATION, 1100);
 
 
 // 最大的缓存大小，单位是 ms
 // 最大的缓存大小，单位是 ms
 // 默认值是：4000
 // 默认值是：4000
-        options.setInteger(AVOptions.KEY_MAX_CACHE_BUFFER_DURATION, 300);
+        options.setInteger(AVOptions.KEY_MAX_CACHE_BUFFER_DURATION, 1200);
 // 是否自动启动播放，如果设置为 1，则在调用 `prepareAsync` 或者 `setVideoPath` 之后自动启动播放，无需调用 `start()`
 // 是否自动启动播放，如果设置为 1，则在调用 `prepareAsync` 或者 `setVideoPath` 之后自动启动播放，无需调用 `start()`
 // 默认值是：1
 // 默认值是：1
         options.setInteger(AVOptions.KEY_START_ON_PREPARED, 0);
         options.setInteger(AVOptions.KEY_START_ON_PREPARED, 0);
@@ -999,10 +1012,10 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
         options.setInteger(AVOptions.KEY_PROBESIZE, 128 * 1024);
         options.setInteger(AVOptions.KEY_PROBESIZE, 128 * 1024);
         options.setInteger(AVOptions.KEY_BUFFER_TIME, 300);
         options.setInteger(AVOptions.KEY_BUFFER_TIME, 300);
 
 
-// 请在开始播放之前配置
-        mVideoView.setAVOptions(options);
-
 
 
+        // 请在开始播放之前配置
+        mVideoView.setAVOptions(options);
+        mPushVideoView.setAVOptions(options);
         mPauseContainer.setOnClickListener(new View.OnClickListener() {
         mPauseContainer.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
@@ -1216,7 +1229,10 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                 xdySdk.api("startRecordPlayback", "");
                 xdySdk.api("startRecordPlayback", "");
             }
             }
         }, 200);
         }, 200);
+        mPushVideoView.start();
         mVideoView.start();
         mVideoView.start();
+
+
     }
     }
 
 
     private void handleTime(String pa) {
     private void handleTime(String pa) {
@@ -1245,6 +1261,14 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
             mVideoView.start();
             mVideoView.start();
             XdyLogUtil.i(TAG, "视频开始");
             XdyLogUtil.i(TAG, "视频开始");
         }
         }
+
+        if (isPause && mPushVideoView != null && mPushVideoView.isPlaying()) {
+            mPushVideoView.pause();
+            XdyLogUtil.i(TAG, "视频停止");
+        } else if (mPushVideoView != null) {
+            mPushVideoView.start();
+            XdyLogUtil.i(TAG, "视频开始");
+        }
     }
     }
 
 
     /**
     /**
@@ -1252,7 +1276,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
      *
      *
      * @param response
      * @param response
      */
      */
-    public void playRecord(String response) {
+    public void playRecord(String response,boolean isAudio) {
         String json_video = aCache.getAsString(response);
         String json_video = aCache.getAsString(response);
         if (TextUtils.isEmpty(json_video)) {
         if (TextUtils.isEmpty(json_video)) {
             ///给出相应的提示表示没有 这个id
             ///给出相应的提示表示没有 这个id
@@ -1262,8 +1286,13 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
         VideoPlayBean videoPlayBean = JsonUtil.parseJsonToBean(json_video, VideoPlayBean.class);
         VideoPlayBean videoPlayBean = JsonUtil.parseJsonToBean(json_video, VideoPlayBean.class);
         if (videoPlayBean != null) {
         if (videoPlayBean != null) {
             //回放不会出现Constants.PLAY_SUCCESS:
             //回放不会出现Constants.PLAY_SUCCESS:
+            if(Constants.HOST.equals(videoPlayBean.getUserRole())) {
                 if (img_playVideo_novideo != null)
                 if (img_playVideo_novideo != null)
                     img_playVideo_novideo.setVisibility(View.GONE);
                     img_playVideo_novideo.setVisibility(View.GONE);
+                if(isAudio){
+                    img_playVideo_novideo.setImageResource(R.mipmap.audio_mode);
+                    img_playVideo_novideo.setVisibility(View.VISIBLE);
+                }
                 if (mVideoView.isPlaying()) {
                 if (mVideoView.isPlaying()) {
                     mVideoView.stopPlayback();
                     mVideoView.stopPlayback();
                 }
                 }
@@ -1273,9 +1302,30 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                     mVideoView.seekTo(videoPlayBean.getSeek() * 1000);
                     mVideoView.seekTo(videoPlayBean.getSeek() * 1000);
                 }
                 }
                 mVideoView.start();
                 mVideoView.start();
+            }else{
+                //推流 回放
+//                if (img_playVideo_novideo != null) {
+//                    img_playVideo_novideo.setVisibility(View.GONE);
+//                }
+                if (mPushVideoView != null) {
+                    mPushVideoView.setVisibility(View.VISIBLE);
                 }
                 }
+                if(isAudio){
+                    mIamgeView_PublishAudio.setVisibility(View.VISIBLE);
+                }
+                if (mPushVideoView.isPlaying()) {
+                    mPushVideoView.stopPlayback();
                 }
                 }
+                mPushVideoView.setVideoPath("http://123.56.73.119:6001/live/h5dev_1992614331_980_983042_1494927366/total.m3u8");
+                if (replay && videoPlayBean.getSeek() > 0) {
 
 
+                    mPushVideoView.seekTo(videoPlayBean.getSeek() * 1000);
+                }
+                mPushVideoView.start();
+            }
+        }
+    }
+   /*回放暂停*/
     public void stopVideo() {
     public void stopVideo() {
         mHandler.post(new Runnable() {
         mHandler.post(new Runnable() {
             @Override
             @Override
@@ -1284,18 +1334,33 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
                 img_playVideo_novideo.setVisibility(View.VISIBLE);
                 img_playVideo_novideo.setVisibility(View.VISIBLE);
             }
             }
         });
         });
+        //隐藏直播回放
+        mPushVideoView.setVisibility(View.GONE);
 
 
-
-        if (isPlayVideoMode && mVideoView != null && mVideoView.isPlaying())
+        if (isPlayVideoMode && mVideoView != null && mVideoView.isPlaying()) {
             mVideoView.stopPlayback();
             mVideoView.stopPlayback();
         }
         }
 
 
+        if (isPlayVideoMode && mPushVideoView != null && mPushVideoView.isPlaying()) {
+            mPushVideoView.stopPlayback();
+        }
+    }
+
     public void stopAudio() {
     public void stopAudio() {
         img_playVideo_novideo.setImageResource(R.mipmap.no_video);
         img_playVideo_novideo.setImageResource(R.mipmap.no_video);
         img_playVideo_novideo.setVisibility(View.VISIBLE);
         img_playVideo_novideo.setVisibility(View.VISIBLE);
 
 
-        if (isPlayVideoMode && mVideoView != null && mVideoView.isPlaying())
+        //隐藏直播回放
+        mPushVideoView.setVisibility(View.GONE);
+        mIamgeView_PublishAudio.setVisibility(View.GONE);
+
+        if (isPlayVideoMode && mVideoView != null && mVideoView.isPlaying()) {
             mVideoView.stopPlayback();
             mVideoView.stopPlayback();
+        }
+
+        if (isPlayVideoMode && mPushVideoView != null && mPushVideoView.isPlaying()) {
+            mPushVideoView.stopPlayback();
+        }
 
 
     }
     }
 
 
@@ -1434,9 +1499,12 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
 /******************************************************公共**********************************/
 /******************************************************公共**********************************/
 
 
 
 
-        /*播放视频*/
+        /*推送视频*/
         public void publishVideo(){
         public void publishVideo(){
             //填写事件
             //填写事件
+            if (!checkPermission()) {
+                return;
+            }
             coverStudent(true);
             coverStudent(true);
             tabletShowAudio(true);
             tabletShowAudio(true);
             mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
             mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
@@ -1450,8 +1518,11 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
             xdySdk.api("publishVideo", "", surfaceView_publish, VideoPlayActivity.this);
             xdySdk.api("publishVideo", "", surfaceView_publish, VideoPlayActivity.this);
             isPublsishVideoMode = true;
             isPublsishVideoMode = true;
         }
         }
-           /*播放音频*/
+           /*推送音频*/
         public void publishAudio(){
         public void publishAudio(){
+            if (!checkPermission()) {
+                return;
+            }
                 coverStudent(true);
                 coverStudent(true);
                 tabletShowAudio(true);
                 tabletShowAudio(true);
                 mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
                 mFramenLayout_stopPublish.setVisibility(View.VISIBLE);

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.adapter;
+package com.mang.xuedianyun.android.adapter;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.text.TextUtils;
 import android.text.TextUtils;
@@ -28,12 +28,12 @@ import android.widget.TextView;
 
 
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.utils.SPUtil;
 import com.mang.xdy.utils.SPUtil;
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.bean.JoinClassSuccessEntity;
-import com.mang.xdy.demo.bean.Message;
-import com.mang.xdy.demo.fragment.ChatFragment;
-import com.mang.xdy.demo.utils.JsonUtil;
-import com.mang.xdy.demo.widget.chat.UrlUtils;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.bean.JoinClassSuccessEntity;
+import com.mang.xuedianyun.android.bean.Message;
+import com.mang.xuedianyun.android.fragment.ChatFragment;
+import com.mang.xuedianyun.android.utils.JsonUtil;
+import com.mang.xuedianyun.android.widget.chat.UrlUtils;
 
 
 import org.kymjs.kjframe.KJBitmap;
 import org.kymjs.kjframe.KJBitmap;
 
 

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.adapter;
+package com.mang.xuedianyun.android.adapter;
 
 
 import android.widget.AbsListView;
 import android.widget.AbsListView;
 import android.widget.ImageView;
 import android.widget.ImageView;
 
 
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.bean.Faceicon;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.bean.Faceicon;
 
 
 import org.kymjs.kjframe.KJBitmap;
 import org.kymjs.kjframe.KJBitmap;
 import org.kymjs.kjframe.widget.AdapterHolder;
 import org.kymjs.kjframe.widget.AdapterHolder;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.adapter;
+package com.mang.xuedianyun.android.adapter;
 
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Bundle;
@@ -23,13 +23,13 @@ import android.support.v4.app.FragmentStatePagerAdapter;
 import android.widget.ImageView;
 import android.widget.ImageView;
 
 
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.widget.chat.ChatFunctionFragment;
-import com.mang.xdy.demo.widget.chat.FacePageFragment;
-import com.mang.xdy.demo.widget.chat.KJChatKeyboard;
-import com.mang.xdy.demo.widget.chat.OnOperationListener;
-import com.mang.xdy.demo.widget.chat.PagerSlidingTabStrip;
-import com.mang.xdy.demo.widget.emoji.EmojiPageFragment;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.widget.chat.ChatFunctionFragment;
+import com.mang.xuedianyun.android.widget.chat.FacePageFragment;
+import com.mang.xuedianyun.android.widget.chat.KJChatKeyboard;
+import com.mang.xuedianyun.android.widget.chat.OnOperationListener;
+import com.mang.xuedianyun.android.widget.chat.PagerSlidingTabStrip;
+import com.mang.xuedianyun.android.widget.emoji.EmojiPageFragment;
 
 
 import org.kymjs.kjframe.bitmap.BitmapCreate;
 import org.kymjs.kjframe.bitmap.BitmapCreate;
 
 

-package com.mang.xdy.demo.adapter;
+package com.mang.xuedianyun.android.adapter;
 
 
 /**
 /**
  * Created by huang on 2017/4/9.
  * Created by huang on 2017/4/9.
@@ -9,9 +9,8 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentPagerAdapter;
 
 
-import com.mang.xdy.demo.fragment.ChatFragment;
-import com.mang.xdy.demo.fragment.DocFragment;
-import com.mang.xdy.demo.fragment.PageFragment;
+import com.mang.xuedianyun.android.fragment.ChatFragment;
+import com.mang.xuedianyun.android.fragment.DocFragment;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;

-package com.mang.xdy.demo.application;
+package com.mang.xuedianyun.android.application;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.app.Application;
 import android.app.Application;
 import android.content.Context;
 import android.content.Context;
 
 
 import com.mang.xdy.core.XdySdk;
 import com.mang.xdy.core.XdySdk;
-import com.mang.xdy.demo.utils.ResUtil;
+import com.mang.xuedianyun.android.utils.ResUtil;
 
 
 /**
 /**
  * Created by abao on 2017/3/30.
  * Created by abao on 2017/3/30.

-package com.mang.xdy.demo.base;
+package com.mang.xuedianyun.android.base;
 
 
 import java.lang.ref.WeakReference;
 import java.lang.ref.WeakReference;
 
 

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 import java.util.List;
 import java.util.List;
-import java.util.List;
 
 
 /**
 /**
  * Created by Admin on 2017/3/27.
  * Created by Admin on 2017/3/27.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by huang on 2017/4/9.
  * Created by huang on 2017/4/9.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by huang on 2017/4/9.
  * Created by huang on 2017/4/9.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by Admin on 2017/3/25.
  * Created by Admin on 2017/3/25.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 import java.util.List;
 import java.util.List;
 
 

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 public class ErrorEntity {
 public class ErrorEntity {
 
 

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/28.
  * Created by abao on 2017/4/28.

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/11.
  * Created by abao on 2017/4/11.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/10.
  * Created by abao on 2017/4/10.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/10. 加入课堂
  * Created by abao on 2017/4/10. 加入课堂

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by huang on 2017/4/9.
  * Created by huang on 2017/4/9.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/10.
  * Created by abao on 2017/4/10.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/7.
  * Created by abao on 2017/4/7.

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * 聊天消息javabean
  * 聊天消息javabean

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by Admin on 2017/3/27.
  * Created by Admin on 2017/3/27.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by Admin on 2017/3/26.
  * Created by Admin on 2017/3/26.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * 教师端主动开启视频
  * 教师端主动开启视频

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/10.
  * Created by abao on 2017/4/10.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/11.
  * Created by abao on 2017/4/11.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/11.
  * Created by abao on 2017/4/11.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 public class ResponseEntity {
 public class ResponseEntity {
     private String type;
     private String type;

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/18.
  * Created by abao on 2017/4/18.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/28.
  * Created by abao on 2017/4/28.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 /**
 /**
  * Created by abao on 2017/4/19.
  * Created by abao on 2017/4/19.

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 // FIXME generate failure  method  set and get MediaId
 // FIXME generate failure  method  set and get MediaId
 // FIXME generate failure  field _$Replay151
 // FIXME generate failure  field _$Replay151

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 import java.util.List;
 import java.util.List;
 
 

-package com.mang.xdy.demo.bean;
+package com.mang.xuedianyun.android.bean;
 
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 
 

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.view.View;
 import android.view.View;
 import android.view.animation.Interpolator;
 import android.view.animation.Interpolator;

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Context;
@@ -15,7 +15,7 @@ import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import android.view.WindowManager.LayoutParams;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 
 
-import com.mang.xdy.demo.utils.DisplayUtil;
+import com.mang.xuedianyun.android.utils.DisplayUtil;
 import com.nineoldandroids.animation.Animator;
 import com.nineoldandroids.animation.Animator;
 
 
 import java.lang.ref.WeakReference;
 import java.lang.ref.WeakReference;

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.view.Gravity;
 import android.view.Gravity;

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.view.MotionEvent;
 import android.view.MotionEvent;

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable;

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Color;
@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 
 
 public class NormalDialog extends BaseDialog {
 public class NormalDialog extends BaseDialog {

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Color;
@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 
 
 /**
 /**

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 public interface OnBtnClick {
 public interface OnBtnClick {
 	void onBtnClick();
 	void onBtnClick();

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 public interface OnBtnLeftClick {
 public interface OnBtnLeftClick {
 	void onBtnLeftClick();
 	void onBtnLeftClick();

-package com.mang.xdy.demo.dialog;
+package com.mang.xuedianyun.android.dialog;
 
 
 public interface OnBtnRightClick {
 public interface OnBtnRightClick {
 	void onBtnRightClick();
 	void onBtnRightClick();

-package com.mang.xdy.demo.fragment;
+package com.mang.xuedianyun.android.fragment;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Bundle;
@@ -18,17 +18,17 @@ import com.google.gson.Gson;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.utils.SPUtil;
 import com.mang.xdy.utils.SPUtil;
 import com.mang.xdy.core.XdySdk;
 import com.mang.xdy.core.XdySdk;
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.adapter.ChatAdapter;
-import com.mang.xdy.demo.bean.ChatMsgEntity;
-import com.mang.xdy.demo.bean.Faceicon;
-import com.mang.xdy.demo.bean.JoinClassSuccessEntity;
-import com.mang.xdy.demo.bean.Message;
-import com.mang.xdy.demo.bean.SendChatMsgEntity;
-import com.mang.xdy.demo.utils.JsonUtil;
-import com.mang.xdy.demo.widget.chat.KJChatKeyboard;
-import com.mang.xdy.demo.widget.chat.OnOperationListener;
-import com.mang.xdy.demo.widget.emoji.DisplayRules;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.adapter.ChatAdapter;
+import com.mang.xuedianyun.android.bean.ChatMsgEntity;
+import com.mang.xuedianyun.android.bean.Faceicon;
+import com.mang.xuedianyun.android.bean.JoinClassSuccessEntity;
+import com.mang.xuedianyun.android.bean.Message;
+import com.mang.xuedianyun.android.bean.SendChatMsgEntity;
+import com.mang.xuedianyun.android.utils.JsonUtil;
+import com.mang.xuedianyun.android.widget.chat.KJChatKeyboard;
+import com.mang.xuedianyun.android.widget.chat.OnOperationListener;
+import com.mang.xuedianyun.android.widget.emoji.DisplayRules;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyLogUtil;
 
 

-package com.mang.xdy.demo.fragment;
+package com.mang.xuedianyun.android.fragment;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
@@ -11,21 +11,20 @@ import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.Glide;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.core.XdySdk;
 import com.mang.xdy.core.XdySdk;
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.base.BaseRunnable;
-import com.mang.xdy.demo.bean.DocEntity;
-import com.mang.xdy.demo.bean.WhiteboardUpdateEntity;
-import com.mang.xdy.demo.bean.WrapDocBitMapEntity;
-import com.mang.xdy.demo.utils.JsonUtil;
-import com.mang.xdy.demo.utils.ToastUtil;
-import com.mang.xdy.demo.widget.CanvasView;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.base.BaseRunnable;
+import com.mang.xuedianyun.android.bean.DocEntity;
+import com.mang.xuedianyun.android.bean.WhiteboardUpdateEntity;
+import com.mang.xuedianyun.android.bean.WrapDocBitMapEntity;
+import com.mang.xuedianyun.android.utils.JsonUtil;
+import com.mang.xuedianyun.android.utils.ToastUtil;
+import com.mang.xuedianyun.android.widget.CanvasView;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyLogUtil;
 
 
@@ -85,7 +84,7 @@ public class DocFragment extends Fragment implements ObserverListener{
         @Override
         @Override
         public void handleMessage(Message msg) {
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             super.handleMessage(msg);
-            ToastUtil.showToastshort("图片加载失败",mContext);
+            ToastUtil.showToastshort(getResources().getString(R.string.imge_load_error),mContext);
         }
         }
     };
     };
 
 
@@ -99,17 +98,15 @@ public class DocFragment extends Fragment implements ObserverListener{
 
 
 
 
     public void init(){
     public void init(){
-
         Bundle arguments = getArguments();
         Bundle arguments = getArguments();
         if(arguments!=null)
         if(arguments!=null)
         replay = arguments.getBoolean("replay");
         replay = arguments.getBoolean("replay");
         DisplayMetrics metric = new DisplayMetrics();
         DisplayMetrics metric = new DisplayMetrics();
         getWindowWith(metric);
         getWindowWith(metric);
         docUrlTransformBitmap(null);
         docUrlTransformBitmap(null);
-//        mCanvasView.setZOrderMediaOverlay(false);
-//        mCanvasView.setZOrderOnTop(false);
-////        mCanvasView.getHolder().setFormat(SurfaceView.TRANSPARENT);
-//        mCanvasView.getHolder().setFormat(SurfaceView.TRANSPARENT);
+        if(replay) {
+            mCanvasView.setZOrderMediaOverlay(true);
+        }
     }
     }
 
 
     private void getWindowWith(DisplayMetrics metric) {
     private void getWindowWith(DisplayMetrics metric) {
@@ -237,7 +234,7 @@ public class DocFragment extends Fragment implements ObserverListener{
                     public void call(WrapDocBitMapEntity resource) {
                     public void call(WrapDocBitMapEntity resource) {
 
 
                         if (resource.getBitmap() == null) {
                         if (resource.getBitmap() == null) {
-                            ToastUtil.showToastshort("图片获取失败",mContext);
+                            ToastUtil.showToastshort(getResources().getString(R.string.imge_load_error),mContext);
                             Bitmap bitmap = getEmptyBitmap();
                             Bitmap bitmap = getEmptyBitmap();
                             mCanvasView.setBitmap(bitmap, false);
                             mCanvasView.setBitmap(bitmap, false);
                         } else {
                         } else {

-package com.mang.xdy.demo.fragment;
+package com.mang.xuedianyun.android.fragment;
 
 
 
 
 import android.os.Bundle;
 import android.os.Bundle;
@@ -9,7 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 
 
 /**
 /**

-package com.mang.xdy.demo.fragment;
+package com.mang.xuedianyun.android.fragment;
 
 
 
 
 import android.os.Bundle;
 import android.os.Bundle;
@@ -7,12 +7,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 /**
 /**
  * A simple {@link Fragment} subclass.
  * A simple {@link Fragment} subclass.
  * Use the {@link PublishFragment#newInstance} factory method to
  * Use the {@link PublishFragment#newInstance} factory method to
  * create an instance of this fragment.
  * create an instance of this fragment.
+ * @deprecated
  */
  */
 public class PublishFragment extends Fragment {
 public class PublishFragment extends Fragment {
     // TODO: Rename parameter arguments, choose names that match
     // TODO: Rename parameter arguments, choose names that match

-package com.mang.xdy.demo.utils;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+package com.mang.xuedianyun.android.utils;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Activity;

-package com.mang.xdy.demo.utils;
+package com.mang.xuedianyun.android.utils;
 
 
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;

-package com.mang.xdy.demo.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.support.annotation.StringRes;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+package com.mang.xuedianyun.android.utils;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.Resources;

-package com.mang.xdy.demo.utils;
+package com.mang.xuedianyun.android.utils;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.widget.Toast;
 import android.widget.Toast;

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.utils.cache;
+package com.mang.xuedianyun.android.utils.cache;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;

-package com.mang.xdy.demo.utils.cache;
+package com.mang.xuedianyun.android.utils.cache;
 
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable;

-package com.mang.xdy.demo.widget;
+package com.mang.xuedianyun.android.widget;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
@@ -17,13 +17,12 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.View;
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.bean.AnnotaionEntity;
-import com.mang.xdy.demo.bean.PointGroupEntity;
-import com.mang.xdy.demo.bean.PointXY;
-import com.mang.xdy.demo.utils.DisplayUtil;
-import com.mang.xdy.demo.utils.ResUtil;
-import com.mang.xdy.utils.XdyLogUtil;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.bean.AnnotaionEntity;
+import com.mang.xuedianyun.android.bean.PointGroupEntity;
+import com.mang.xuedianyun.android.bean.PointXY;
+import com.mang.xuedianyun.android.utils.DisplayUtil;
+import com.mang.xuedianyun.android.utils.ResUtil;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Iterator;

+package com.mang.xuedianyun.android.widget.answersheet;
+
+import android.content.Context;
+import android.os.CountDownTimer;
+import android.util.AttributeSet;
+import android.view.Display;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.utils.ToastUtil;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by abao on 2017/5/5.
+ * @deprecated
+ */
+
+public class AnswerSheetView extends RelativeLayout {
+    /*单选多选类型*/
+    public final static int ANSWER_TYPE_SINGLE_OR_MORE = 1;
+    /*对错类型*/
+    public final static int ANSWER_TYPE_RIGHT_OR_WRONG = 2;
+    /*填空*/
+    public final static int ANSWER_TYPE_FILLING = 3;
+    /*单前的type*/
+    private static int ANSWER_CURRENT_TYPE = 1;
+    /*倒计时时间 s*/
+    public static int ANSWER_TIMEOUT = 30;
+    @BindView(R.id.tv_exam_countdown)
+    TextView tvExamCountdown;
+    @BindView(R.id.rel_home_tv_exam_countdown)
+    RelativeLayout relHomeTvExamCountdown;
+    @BindView(R.id.cb_exam_A)
+    CheckBox cbExamA;
+    @BindView(R.id.cb_exam_B)
+    CheckBox cbExamB;
+    @BindView(R.id.cb_exam_C)
+    CheckBox cbExamC;
+    @BindView(R.id.cb_exam_D)
+    CheckBox cbExamD;
+    @BindView(R.id.ll_exam_SingleOrMore)
+    LinearLayout llExamSingleOrMore;
+    @BindView(R.id.rb_exam_R)
+    RadioButton rbExamR;
+    @BindView(R.id.rb_exam_W)
+    RadioButton rbExamW;
+    @BindView(R.id.ll_exam_selectRightOrWrong)
+    LinearLayout llExamSelectRightOrWrong;
+    @BindView(R.id.ll_exam_filling)
+    LinearLayout llExamFilling;
+    @BindView(R.id.tv_exam_up)
+    TextView tvExamUp;
+    @BindView(R.id.tv_exam_cancle)
+    TextView tvExamCancle;
+    @BindView(R.id.ll_exam_submit)
+    LinearLayout llExamSubmit;
+    @BindView(R.id.rel_exam_layout)
+    RelativeLayout relExamLayout;
+    @BindView(R.id.ll_exam_answer)
+    LinearLayout llExamAnswer;
+
+    private AnswerCount mAnswerCount;
+
+    private StringBuffer sb = new StringBuffer();
+    private Context mContext;
+    private String character_close="关闭";
+    private String character_cancle="放弃";
+    Display display;
+
+    private OnAnswerLayoutChangeListener onAnswerLayoutChangeListener;
+    public interface OnAnswerLayoutChangeListener{
+        /**
+         * 改变显示布局的大小
+         * @param
+         */
+        void setAnswerSheetFramLayout(int num);
+
+        void setAnswerSheetNormal(int num);
+    }
+    public void setOnAnswerLayoutChangeListener(OnAnswerLayoutChangeListener onAnswerLayoutChangeListener){
+        this.onAnswerLayoutChangeListener=onAnswerLayoutChangeListener;
+    }
+
+
+
+    public AnswerSheetView(Context context) {
+        this(context, null);
+    }
+
+    public AnswerSheetView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public AnswerSheetView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+        View view = initView(context);
+
+        this.addView(view);
+    }
+
+    public View initView(Context context) {
+        View view = LayoutInflater.from(context).inflate(R.layout.item_answer, null);
+        ButterKnife.bind(this, view);
+        return view;
+    }
+
+    /*选择答题类型*/
+    public void selectAnswerSheetType(int type) {
+        tvExamCountdown.setText("_s");
+        llExamAnswer.setVisibility(View.GONE);
+        tvExamUp.setVisibility(View.VISIBLE);
+        tvExamCancle.setText(character_cancle);
+        switch (type) {
+            case ANSWER_TYPE_SINGLE_OR_MORE:
+                ANSWER_CURRENT_TYPE = ANSWER_TYPE_SINGLE_OR_MORE;
+                llExamSingleOrMore.setVisibility(View.VISIBLE);
+                llExamSelectRightOrWrong.setVisibility(View.GONE);
+                llExamFilling.setVisibility(View.GONE);
+                break;
+            case ANSWER_TYPE_RIGHT_OR_WRONG:
+                ANSWER_CURRENT_TYPE = ANSWER_TYPE_RIGHT_OR_WRONG;
+                llExamSingleOrMore.setVisibility(View.GONE);
+                llExamSelectRightOrWrong.setVisibility(View.VISIBLE);
+                llExamFilling.setVisibility(View.GONE);
+                break;
+            case ANSWER_TYPE_FILLING:
+                ANSWER_CURRENT_TYPE = ANSWER_TYPE_FILLING;
+                llExamSingleOrMore.setVisibility(View.GONE);
+                llExamSelectRightOrWrong.setVisibility(View.GONE);
+                llExamFilling.setVisibility(View.VISIBLE);
+                break;
+
+        }
+    }
+
+    @OnClick({R.id.tv_exam_up, R.id.tv_exam_cancle})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_exam_up:
+                //提交需要获取结果，清除数据,时间清理
+//                relExamLayout.setVisibility(GONE);
+                handleAnswer(ANSWER_CURRENT_TYPE);
+                ToastUtil.showToastshort("选择答案：" + sb.toString() + sb.length(), mContext);
+                recoverStatus();
+                setSubmitAnswer();
+                break;
+            case R.id.tv_exam_cancle:
+                recoverStatus();
+//                if(character_cancle.equals(tvExamCancle)) {
+//                    setAnsNormalLayout(53);
+//                }else{
+//
+//                }
+                if(relExamLayout.isShown()){
+                    relExamLayout.setVisibility(GONE);
+                }
+                break;
+        }
+    }
+
+    /*开始倒计时*/
+    public void startCountTimer(int time) {
+        ANSWER_TIMEOUT = time;
+        cancleCountTimer();
+        mAnswerCount = new AnswerCount(ANSWER_TIMEOUT * 1000, 1000);
+        mAnswerCount.start();
+        //提交需要获取结果，清除数据,时间清理
+        relExamLayout.setVisibility(VISIBLE);
+    }
+
+    /*销毁倒计时*/
+    public void cancleCountTimer() {
+        if (mAnswerCount != null) {
+            mAnswerCount.cancel();
+        }
+    }
+
+    /**
+     * 处理结果，拼装答案
+     *
+     * @param type
+     */
+    public void handleAnswer(int type) {
+        switch (type) {
+            case ANSWER_TYPE_SINGLE_OR_MORE:
+                handleSingleOrMore();
+                break;
+            case ANSWER_TYPE_RIGHT_OR_WRONG:
+                handleRightOrWrong();
+                break;
+            case ANSWER_TYPE_FILLING:
+
+                break;
+        }
+
+    }
+
+    /*单选，多选答案拼接*/
+    public void handleSingleOrMore() {
+        sb.setLength(0);
+        if (cbExamA.isChecked()) {
+            sb.append("A");
+        }
+        if (cbExamB.isChecked()) {
+            sb.append("B");
+        }
+        if (cbExamC.isChecked()) {
+            sb.append("C");
+        }
+        if (cbExamD.isChecked()) {
+            sb.append("D");
+        }
+
+    }
+
+    /*处理对错*/
+    public void handleRightOrWrong() {
+        sb.setLength(0);
+        if (rbExamR.isChecked()) {
+            sb.append("对");
+        } else {
+            sb.append("错");
+        }
+
+    }
+
+    /*恢复状态*/
+    public void recoverStatus() {
+        switch (ANSWER_CURRENT_TYPE) {
+            case ANSWER_TYPE_SINGLE_OR_MORE:
+                cbExamA.setChecked(false);
+                cbExamB.setChecked(false);
+                cbExamC.setChecked(false);
+                cbExamD.setChecked(false);
+                break;
+            case ANSWER_TYPE_RIGHT_OR_WRONG:
+                rbExamR.setChecked(true);
+                rbExamW.setChecked(false);
+                break;
+            case ANSWER_TYPE_FILLING:
+                break;
+        }
+    }
+    /*隐藏所有题目*/
+    private void hideAllTitle(){
+        llExamSingleOrMore.setVisibility(View.GONE);
+        llExamSelectRightOrWrong.setVisibility(View.GONE);
+        llExamFilling.setVisibility(View.GONE);
+    }
+    /*设置显示答案布局大小*/
+    public void setAnswerLayout(int num){
+        if(onAnswerLayoutChangeListener!=null) {
+            onAnswerLayoutChangeListener.setAnswerSheetFramLayout(num);
+        }
+    }
+
+    /*设置显示答案布局大小*/
+    public void setAnsNormalLayout(int num){
+        if(onAnswerLayoutChangeListener!=null) {
+            onAnswerLayoutChangeListener.setAnswerSheetNormal(num);
+        }
+    }
+    /*提交答案 设置*/
+    private void setSubmitAnswer(){
+        hideAllTitle();
+        llExamAnswer.setVisibility(View.VISIBLE);
+        cancleCountTimer();
+        tvExamUp.setVisibility(View.GONE);
+        tvExamCancle.setText(character_close);
+        setAnswerLayout(100);
+
+    }
+    @OnClick(R.id.ll_exam_answer)
+    public void onViewClicked() {
+    }
+
+    /*倒计时处理*/
+    class AnswerCount extends CountDownTimer {
+
+        /**
+         * @param millisInFuture    The number of millis in the future from the call
+         *                          to {@link #start()} until the countdown is done and {@link #onFinish()}
+         *                          is called.
+         * @param countDownInterval The interval along the way to receive
+         *                          {@link #onTick(long)} callbacks.
+         */
+        public AnswerCount(long millisInFuture, long countDownInterval) {
+            super(millisInFuture, countDownInterval);
+        }
+
+        @Override
+        public void onTick(long millisUntilFinished) {
+            if (millisUntilFinished < 10) {
+                tvExamCountdown.setText(" " + millisUntilFinished / 1000 + "s");
+            } else {
+                tvExamCountdown.setText(millisUntilFinished / 1000 + "s");
+            }
+
+        }
+
+        @Override
+        public void onFinish() {
+            //这个结束应该做自动提交答案的工作
+            tvExamCountdown.setText("0s");
+        }
+    }
+}

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 import android.os.Bundle;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
@@ -22,7 +22,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 
 
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 import org.kymjs.kjframe.ui.SupportFragment;
 import org.kymjs.kjframe.ui.SupportFragment;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Color;
@@ -36,9 +36,9 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.RadioGroup;
 
 
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.adapter.FaceAdapter;
-import com.mang.xdy.demo.bean.Faceicon;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.adapter.FaceAdapter;
+import com.mang.xuedianyun.android.bean.Faceicon;
 
 
 import org.kymjs.kjframe.ui.SupportFragment;
 import org.kymjs.kjframe.ui.SupportFragment;
 import org.kymjs.kjframe.utils.StringUtils;
 import org.kymjs.kjframe.utils.StringUtils;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Context;
@@ -29,8 +29,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
 
 
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.adapter.FaceCategroyAdapter;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.adapter.FaceCategroyAdapter;
 
 
 import java.util.List;
 import java.util.List;
 
 

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 
 
-import com.mang.xdy.demo.bean.Faceicon;
+import com.mang.xuedianyun.android.bean.Faceicon;
 
 
 /**
 /**
  * 表情栏顶部按钮的监听器
  * 表情栏顶部按钮的监听器

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Context;
@@ -39,7 +39,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 import java.util.Locale;
 import java.util.Locale;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 import android.graphics.Rect;
 import android.graphics.Rect;
 import android.view.View;
 import android.view.View;

-package com.mang.xdy.demo.widget.chat;
+package com.mang.xuedianyun.android.widget.chat;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;

+package com.mang.xuedianyun.android.widget.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.mang.xuedianyun.android.R;
+
+import butterknife.ButterKnife;
+
+
+/**
+ * Created by abao on 2017/5/9.
+ * @deprecated
+ */
+
+public class AnswText {
+
+
+
+
+
+
+    /*单选多选类型*/
+    public final static int ANSWER_TYPE_SINGLE_OR_MORE = 1;
+    /*对错类型*/
+    public final static int ANSWER_TYPE_RIGHT_OR_WRONG = 2;
+    /*填空*/
+    public final static int ANSWER_TYPE_FILLING = 3;
+    /*单前的type*/
+    private static int ANSWER_CURRENT_TYPE = 1;
+    /*倒计时时间 s*/
+    public static int ANSWER_TIMEOUT = 30;
+
+
+
+    private StringBuffer sb = new StringBuffer();
+    private Context mContext;
+    private String character_close="关闭";
+    private String character_cancle="放弃";
+
+    private OnAnswerLayoutChangeListener onAnswerLayoutChangeListener;
+    public interface OnAnswerLayoutChangeListener{
+        /**
+         * 改变显示布局的大小
+         * @param
+         */
+        void setAnswerSheetFramLayout(int num);
+
+        void setAnswerSheetNormal(int num);
+    }
+    public void setOnAnswerLayoutChangeListener(OnAnswerLayoutChangeListener onAnswerLayoutChangeListener){
+        this.onAnswerLayoutChangeListener=onAnswerLayoutChangeListener;
+    }
+
+    private Context context;
+    private Dialog dialog;
+    private TextView txt_title;
+    private TextView txt_cancel;
+    private LinearLayout lLayout_content;
+    private ScrollView sLayout_content;
+    private boolean showTitle = false;
+//    private List<ActionSheetDialog.SheetItem> sheetItemList;
+    private Display display;
+
+    public AnswText(Context context) {
+        this.context = context;
+        this.mContext=context;
+        WindowManager windowManager = (WindowManager) context
+                .getSystemService(Context.WINDOW_SERVICE);
+        display = windowManager.getDefaultDisplay();
+    }
+
+    public AnswText builder() {
+       View  view = LayoutInflater.from(context).inflate(
+                R.layout.view_text, null);
+        ButterKnife.bind(this,view);
+        view.setMinimumWidth(display.getWidth());
+
+        dialog = new Dialog(context, R.style.ActionSheetDialogStyle);
+        dialog.setContentView(view);
+        Window dialogWindow = dialog.getWindow();
+        dialogWindow.setGravity(Gravity.LEFT | Gravity.BOTTOM);
+//        dialogWindow.setGravity( Gravity.BOTTOM);
+        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+        lp.x = 0;
+        lp.y = 0;
+        dialogWindow.setAttributes(lp);
+        return this;
+    }
+    public void show() {
+        dialog.show();
+    }
+
+
+
+}
+

-package com.mang.xdy.demo.widget.dialog;
+package com.mang.xuedianyun.android.widget.dialog;
 
 
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Context;
@@ -12,15 +12,14 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.CheckBox;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.utils.ToastUtil;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.utils.ToastUtil;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyStringUtils;
 import com.mang.xdy.utils.XdyStringUtils;
 
 

-package com.mang.xdy.demo.widget.dialog;
+package com.mang.xuedianyun.android.widget.dialog;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.view.Gravity;
 import android.view.Gravity;
@@ -7,8 +7,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.EditText;
 
 
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.dialog.BaseDialog;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.dialog.BaseDialog;
 import com.mang.xdy.utils.UIUtils;
 import com.mang.xdy.utils.UIUtils;
 
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;

-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 import android.view.KeyEvent;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.EditText;

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 import android.widget.AbsListView;
 import android.widget.AbsListView;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 import org.kymjs.kjframe.widget.AdapterHolder;
 import org.kymjs.kjframe.widget.AdapterHolder;
 import org.kymjs.kjframe.widget.KJAdapter;
 import org.kymjs.kjframe.widget.KJAdapter;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Bundle;
@@ -31,8 +31,8 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.RadioGroup;
 
 
 
 
-import com.mang.xdy.demo.R;
-import com.mang.xdy.demo.widget.chat.OnOperationListener;
+import com.mang.xuedianyun.android.R;
+import com.mang.xuedianyun.android.widget.chat.OnOperationListener;
 
 
 import org.kymjs.kjframe.ui.SupportFragment;
 import org.kymjs.kjframe.ui.SupportFragment;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 /**
 /**
  * emoji表情的javabean
  * emoji表情的javabean

-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 
 
-import com.mang.xdy.demo.R;
+import com.mang.xuedianyun.android.R;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;

-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.content.res.TypedArray;

-package com.mang.xdy.demo.widget.emoji;
+package com.mang.xuedianyun.android.widget.emoji;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.content.res.TypedArray;

-package com.mang.xdy.demo.widget.view;
+package com.mang.xuedianyun.android.widget.view;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.os.Build;
 import android.os.Build;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
 
 
-import com.mang.xdy.demo.utils.DisplayUtil;
+import com.mang.xuedianyun.android.utils.DisplayUtil;
 
 
 
 
 public class AutoAdaptHeaderViewGroup extends RelativeLayout {
 public class AutoAdaptHeaderViewGroup extends RelativeLayout {

-package com.mang.xdy.demo.widget.view;
+package com.mang.xuedianyun.android.widget.view;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager;

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/home_btn_green_press" android:state_pressed="true"></item>
+    <item android:drawable="@color/home_btn_green_press" android:state_checked="true"></item>
+    <item android:drawable="@color/home_btn_green"></item>
+</selector>

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/answer_select" android:state_checked="true" />
+    <item android:drawable="@drawable/answer_unselect" />
+</selector>

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/spreadback" android:state_checked="true" />
+    <item android:drawable="@drawable/foldback" />
+</selector>

+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false" >
+    <solid android:color="@color/colorSkyBlue" />
+    <!--<padding-->
+        <!--android:left="2dp"-->
+        <!--android:top="1dp"-->
+        <!--android:right="2dp"-->
+        <!--android:bottom="1dp" />-->
+    <!--<solid-->
+        <!--android:color="@color/actionsheet_red" />-->
+    <!--<stroke-->
+        <!--android:width="1dp"-->
+        <!--android:color="@android:color/white" />-->
+    <size android:width="18dp"
+        android:height="18dp" />
+</shape>

+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false" >
+    <solid android:color="@color/actionsheet_red" />
+    <!--<padding-->
+        <!--android:left="2dp"-->
+        <!--android:top="1dp"-->
+        <!--android:right="2dp"-->
+        <!--android:bottom="1dp" />-->
+    <!--<solid-->
+        <!--android:color="@color/actionsheet_red" />-->
+    <!--<stroke-->
+        <!--android:width="1dp"-->
+        <!--android:color="@android:color/white" />-->
+    <size android:width="18dp"
+        android:height="18dp" />
+</shape>

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- 圆角 -->
+    <corners android:radius="16dp" />
+
+    <!-- 填充颜色 -->
+    <solid android:color="@color/colorSkyBlue" />
+
+
+    <!--&lt;!&ndash;内边距&ndash;&gt;-->
+    <padding
+        android:bottom="5dp"
+        android:left="5dp"
+        android:right="5dp"
+        android:top="5dp" />
+</shape>

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- 圆角 -->
+    <corners android:radius="16dp" />
+
+    <!-- 填充颜色 -->
+    <solid android:color="@color/colorGrey" />
+
+
+    <!--内边距-->
+    <padding
+        android:bottom="5dp"
+        android:left="5dp"
+        android:right="5dp"
+        android:top="5dp" />
+</shape>

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:orientation="vertical"
-    tools:context="com.mang.xdy.demo.MainActivity">
+    tools:context="com.mang.xuedianyun.android.MainActivity">
   <RelativeLayout
   <RelativeLayout
       android:id="@+id/rl_home_close"
       android:id="@+id/rl_home_close"
       android:layout_width="@dimen/ui_DIMEN_98.0PX"
       android:layout_width="@dimen/ui_DIMEN_98.0PX"

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/activity_video_play"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#e3e4e6"
+    tools:context="com.mang.xuedianyun.android.activity.VideoPlayActivity">
+        <RelativeLayout
+            android:id="@+id/avg_videoPlay_back"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:paddingLeft="@dimen/ui_DIMEN_20.0PX"
+            android:paddingRight="@dimen/ui_DIMEN_20.0PX">
+
+            <ImageView
+                android:id="@+id/img_videoPlay_back"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/ui_titlebar_height"
+                android:paddingRight="10dp"
+                android:paddingLeft="15dp"
+                android:src="@mipmap/back"/>
+            <TextView
+                android:layout_toRightOf="@+id/img_videoPlay_back"
+                android:layout_width="wrap_content"
+                style="@style/ui_wrapTvBaseStyle"
+                android:layout_height="@dimen/ui_titlebar_height"
+                android:text="@string/home_title_back"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:visibility="gone"
+                />
+            <TextView
+                android:id="@+id/tv_videoPlay_className"
+                style="@style/ui_wrapTvBaseStyle"
+                android:layout_height="@dimen/ui_titlebar_height"
+                android:gravity="center"
+                android:layout_centerHorizontal="true"
+                android:textColor="@color/white"
+                android:layout_toRightOf="@+id/img_videoPlay_back"
+                tools:text="dfdfdfdfdfdf"
+                android:textSize="@dimen/ui_DIMEN_34.0PX"/>
+        </RelativeLayout>
+    <!--白板+right-->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:layout_below="@+id/avg_videoPlay_back"
+        android:layout_above="@+id/fl_media"
+        >
+
+    <LinearLayout
+        android:id="@+id/ll_videoPlay_right"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_alignParentRight="true"
+        >
+    <RelativeLayout
+        android:id="@+id/rel_videoPlay_play"
+        android:layout_width="255dp"
+        android:layout_alignParentRight="true"
+        android:layout_weight="1"
+        android:layout_height="wrap_content">
+        <com.pili.pldroid.player.widget.PLVideoTextureView
+            android:id="@+id/img_playVideo_replay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+    <SurfaceView
+        android:id="@+id/surfaceview_playVideo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+         />
+            <ImageView
+                android:id="@+id/img_playVideo_novideo"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@mipmap/novideo"
+                />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        </FrameLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_alignParentRight="true"
+            android:id="@+id/linearLayout">
+
+        </LinearLayout>
+
+
+
+    </RelativeLayout>
+
+   <!--推流-->
+    <RelativeLayout
+        android:id="@+id/rel_videoPlay_publish"
+        android:layout_width="255dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_below="@+id/rel_videoPlay_play"
+        android:layout_alignParentRight="true"
+        android:layout_alignLeft="@+id/rel_videoPlay_play"
+        android:layout_marginTop="8dp"
+        >
+
+        <SurfaceView
+            android:id="@+id/sur_plaVideo_publish"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            />
+        <FrameLayout
+            android:id="@+id/fra_videoPlay_student_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            >
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/student"
+                tools:visibility="visible"
+                android:layout_gravity="center"
+                android:scaleType="fitCenter"
+                />
+        </FrameLayout>
+
+        <ImageView
+            android:id="@+id/img_playVideo_publishAudio"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@mipmap/audio_mode"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:scaleType="fitCenter"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            />
+        <FrameLayout
+            android:id="@+id/fra_videoPlay_start"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+
+            tools:visibility="visible"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            >
+            <ImageView
+                android:id="@+id/img_videoPlay_start"
+                android:layout_width="20dp"
+                android:layout_height="12dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginLeft="5dp"
+                android:background="@mipmap/camera_normal2x"
+                />
+        </FrameLayout>
+        <!--音频-->
+        <FrameLayout
+            android:id="@+id/fra_videoPlay_start_audio"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_toRightOf="@+id/fra_videoPlay_start"
+            tools:visibility="visible"
+            android:layout_alignParentBottom="true"
+            >
+            <ImageView
+                android:id="@+id/img_videoPlay_start_audio"
+                android:layout_width="12dp"
+                android:layout_height="20dp"
+                android:layout_marginTop="15dp"
+                android:background="@mipmap/mic_normal2x"
+                />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/fra_videoPlay_stopPublish"
+            android:layout_width="70dp"
+            android:layout_height="50dp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            android:layout_alignBottom="@+id/sur_plaVideo_publish"
+            >
+            <ImageView
+                android:id="@+id/img_videoPlay_stopPublish"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginLeft="15dp"
+                android:enabled="false"
+                android:background="@mipmap/hangup_normal2x"
+                />
+        </FrameLayout>
+    </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_videoPlay_tablet_chat"
+            android:layout_width="255dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginTop="8dp"
+            />
+    </LinearLayout>
+    <!--Tablet文档-->
+    <LinearLayout
+        android:id="@+id/ll_videoPlay_tablet_doc"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="3"
+        android:orientation="vertical"
+        android:layout_marginRight="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_toLeftOf="@+id/ll_videoPlay_right"
+        />
+
+    </RelativeLayout>
+    <com.flyco.tablayout.SlidingTabLayout
+        android:id="@+id/stl_videoPlay_tab"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/ui_titlebar_height"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:background="#fafafa"
+        custom:tl_indicator_color="@color/home_tab_selected"
+        custom:tl_indicator_corner_radius="1.5dp"
+        custom:tl_indicator_height="@dimen/ui_DIMEN_5.0PX"
+        custom:tl_tab_space_equal="true"
+        custom:tl_textSelectColor="@color/home_tab_selected"
+        custom:tl_textUnselectColor="@color/home_tab_unselected"
+        custom:tl_textsize="@dimen/ui_DIMEN_28.0PX"/>
+    <com.mang.xuedianyun.android.widget.view.NoScrollViewPager
+        android:id="@+id/viewpager"
+        android:layout_below="@+id/stl_videoPlay_tab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignRight="@+id/stl_videoPlay_tab"
+
+
+        android:background="@android:color/white" >
+
+        </com.mang.xuedianyun.android.widget.view.NoScrollViewPager>
+
+
+    <FrameLayout
+        android:id="@+id/fl_media"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        >
+        <include
+            layout="@layout/home_media_controller"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+
+</RelativeLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_video_play"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.mang.xuedianyun.android.activity.VideoPlayActivity">
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        >
+        <SurfaceView
+            android:id="@+id/surfaceview_playVideo"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:visibility="gone"/>
+        <ImageView
+            android:id="@+id/img_playVideo_novideo"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:background="@mipmap/novideo"
+            />
+    </RelativeLayout>
+    <SurfaceView
+        android:id="@+id/surfaceview_pubisherVideo"
+        android:layout_width="match_parent"
+        android:layout_height="300dp" />
+    <android.support.design.widget.TabLayout
+        android:id="@+id/sliding_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="1"
+        android:background="@android:color/white" />
+    <TextView
+        android:id="@+id/tv_videoPlay_url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/btn_videoPlay_chat"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="发送hello"
+            android:visibility="gone"
+            />
+        <Button
+            android:id="@+id/btn_videoPlay_pubsherVideo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="获取推流地址推送视频"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/btn_videoPlay_publisherAudio"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="获取推流地址推送音频"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/btn_videoPlay_stop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="停止推流"
+            />
+    </LinearLayout>
+</LinearLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:layout_width="@dimen/ui_DIMEN_500.0PX"
+    android:layout_height="wrap_content"
+    android:layout_centerInParent="true"
+    android:background="@drawable/radius_solid_white_stroke_999"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/ui_DIMEN_20.0PX"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+<EditText
+    android:id="@+id/dialog_edt_username"
+    style="@style/home_login_edit_style"
+    android:hint="用户名"/>
+    <EditText
+        android:id="@+id/dialog_edt_userpwd"
+        style="@style/home_login_edit_style"
+        android:hint="密码"/>
+    <Button
+        android:id="@+id/dialog_btn_enter"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        style="@style/home_site_btn_style"
+        android:text="登录"
+        />
+</LinearLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_chat_fragment_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ebebeb"
+    android:orientation="vertical">
+
+    <com.mang.xuedianyun.android.widget.chat.KJChatKeyboard
+        android:id="@+id/chat_msg_input_box"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true" />
+
+    <ListView
+        android:id="@+id/chat_listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/chat_msg_input_box"
+        android:cacheColorHint="#00000000"
+        android:divider="@null"
+        android:dividerHeight="8.33dp"
+        android:scrollbarStyle="outsideOverlay"
+        android:transcriptMode="normal" />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_below="@id/chat_listview"
+        android:background="#7fd8d8d8" />
+
+
+    <!--   -->
+
+</RelativeLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+  <com.mang.xuedianyun.android.widget.CanvasView
+      android:id="@+id/canvas_doc_show"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+</RelativeLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center" />

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.mang.xuedianyun.android.fragment.PublishFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <SurfaceView
+        android:id="@+id/sur_publish"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:text="@string/hello_blank_fragment" />
+    <Button
+        android:id="@+id/btn_publish_gets"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="获取推流地址，开始推流"
+        />
+    <Button
+        android:id="@+id/btn_publish_stop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="停止推流"
+        />
+</FrameLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="160dp"
+              android:orientation="vertical">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/frag_pager_face"
+        android:layout_width="match_parent"
+        android:layout_height="150dp">
+    </android.support.v4.view.ViewPager>
+
+    <RadioGroup
+        android:id="@+id/frag_point"
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:layout_marginBottom="6dip"
+        android:background="#00000000"
+        android:gravity="center"
+        android:orientation="horizontal">
+    </RadioGroup>
+
+</LinearLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<com.mang.xuedianyun.android.widget.emoji.EmoticonsTextView
+    android:id="@+id/itemEmoji"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="33dp"
+    android:layout_height="33dp"
+    android:layout_margin="2dp"
+    android:adjustViewBounds="true"
+    android:background="@android:color/transparent"
+    android:gravity="center"
+    android:textColor="@android:color/black"
+    android:textSize="25sp"/>

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
+                android:gravity="center"
+                android:padding="5dip">
+
+    <ImageView
+        android:id="@+id/itemImage"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_centerInParent="true"
+        android:adjustViewBounds="true"
+        android:contentDescription="@null"
+        android:scaleType="centerCrop"/>
+
+</RelativeLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:my="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/ui_DIMEN_24.0PX"
+    android:paddingRight="@dimen/ui_DIMEN_24.0PX">
+
+
+    <TextView
+        android:id="@+id/chat_item_date"
+        android:layout_width="@dimen/ui_DIMEN_80.0PX"
+        android:layout_height="@dimen/ui_DIMEN_35.0PX"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/home_chat_item_date_bg"
+        android:gravity="center"
+        android:textColor="#ffffff"
+        android:textSize="@dimen/ui_DIMEN_22.0PX"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp">
+
+        <ImageView
+
+            android:id="@+id/chat_item_avatar"
+            style="@style/home_chat_item_avatar"
+            android:layout_alignParentLeft="true" />
+
+        <LinearLayout
+            android:id="@+id/ll_item_name_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/ui_DIMEN_20.0PX"
+            android:layout_toRightOf="@id/chat_item_avatar"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/chat_item_taacher_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/ui_DIMEN_8.0PX"
+                android:background="@drawable/home_chat_teacher_bg"
+                android:gravity="center"
+                android:paddingLeft="@dimen/ui_DIMEN_10.0PX"
+                android:paddingRight="@dimen/ui_DIMEN_10.0PX"
+                android:text="老师"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/ui_DIMEN_20.0PX"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/chat_item_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textColor="#808080"
+                android:textSize="@dimen/ui_DIMEN_22.0PX" />
+        </LinearLayout>
+
+
+        <RelativeLayout
+            android:id="@+id/chat_item_layout_content"
+            style="@style/home_chat_item_content"
+            android:layout_below="@id/ll_item_name_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="@dimen/ui_DIMEN_8.0PX"
+            android:layout_toRightOf="@id/chat_item_avatar">
+
+            <com.mang.xuedianyun.android.widget.emoji.EmoticonsTextView
+                android:id="@+id/chat_item_content_text"
+                style="@style/home_chat_item_text_content"
+                android:layout_centerInParent="true"
+                android:background="@drawable/chat_pop_receive"
+                android:gravity="start|center_vertical"
+                android:paddingLeft="@dimen/ui_DIMEN_20.0PX"
+                android:paddingRight="@dimen/ui_DIMEN_10.0PX"
+                my:emojiconSize="@dimen/ui_DIMEN_40.0PX"
+                tools:text="" />
+
+            <ImageView
+                android:id="@+id/chat_item_content_image"
+                style="@style/home_chat_item_image_content"
+                android:visibility="gone" />
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/chat_item_fail"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/chat_item_layout_content"
+            android:background="@mipmap/msg_state_fail_resend"
+            android:focusable="false"
+            android:visibility="gone" />
+
+        <ProgressBar
+            android:id="@+id/chat_item_progress"
+            style="@android:style/Widget.ProgressBar.Small.Inverse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/chat_item_layout_content"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+</LinearLayout>

@@ -67,7 +67,7 @@
             android:layout_toLeftOf="@id/chat_item_avatar"
             android:layout_toLeftOf="@id/chat_item_avatar"
             android:gravity="end">
             android:gravity="end">
 
 
-            <com.mang.xdy.demo.widget.emoji.EmoticonsTextView
+            <com.mang.xuedianyun.android.widget.emoji.EmoticonsTextView
                 android:id="@+id/chat_item_content_text"
                 android:id="@+id/chat_item_content_text"
                 style="@style/home_chat_item_text_content"
                 style="@style/home_chat_item_text_content"
                 android:layout_centerVertical="true"
                 android:layout_centerVertical="true"

@@ -33,7 +33,7 @@
           android:visibility="gone"
           android:visibility="gone"
             android:button="@null"/>
             android:button="@null"/>
 
 
-        <com.mang.xdy.demo.widget.emoji.EmoticonsEditText
+        <com.mang.xuedianyun.android.widget.emoji.EmoticonsEditText
             android:id="@+id/toolbox_et_message"
             android:id="@+id/toolbox_et_message"
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="160dp"></android.support.v4.view.ViewPager>
             android:layout_height="160dp"></android.support.v4.view.ViewPager>
 
 
-        <com.mang.xdy.demo.widget.chat.PagerSlidingTabStrip
+        <com.mang.xuedianyun.android.widget.chat.PagerSlidingTabStrip
             android:id="@+id/toolbox_tabs"
             android:id="@+id/toolbox_tabs"
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_height="40dp"

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:orientation="vertical"
-    tools:context="com.mang.xdy.demo.MainActivity">
+    tools:context="com.mang.xuedianyun.android.MainActivity">
   <RelativeLayout
   <RelativeLayout
       android:id="@+id/rl_home_close"
       android:id="@+id/rl_home_close"
       android:layout_width="@dimen/ui_DIMEN_98.0PX"
       android:layout_width="@dimen/ui_DIMEN_98.0PX"
@@ -44,7 +44,7 @@
         style="@style/home_input_edit_style"
         style="@style/home_input_edit_style"
         android:hint="classId"
         android:hint="classId"
         android:inputType="number"
         android:inputType="number"
-        android:text="118417229"/>
+        android:text="1992614331"/>
 
 
     <View
     <View
         style="@style/ui_divider_line_horizontal"
         style="@style/ui_divider_line_horizontal"

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:orientation="vertical"
-    tools:context="com.mang.xdy.demo.activity.VideoPlayActivity">
+    tools:context="com.mang.xuedianyun.android.activity.VideoPlayActivity">
     <RelativeLayout
     <RelativeLayout
         android:id="@+id/rel_videoPlay_play"
         android:id="@+id/rel_videoPlay_play"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
@@ -21,13 +21,12 @@
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
          />
          />
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
             <ImageView
             <ImageView
                 android:id="@+id/img_playVideo_novideo"
                 android:id="@+id/img_playVideo_novideo"
                 android:layout_width="match_parent"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_height="match_parent"
-                android:background="@mipmap/novideo"
+                android:scaleType="fitXY"
+                android:background="@mipmap/no_video"
                 />
                 />
         <FrameLayout
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_width="match_parent"
@@ -59,6 +58,12 @@
                     android:layout_alignParentTop="true"
                     android:layout_alignParentTop="true"
                     android:paddingLeft="@dimen/ui_DIMEN_20.0PX"
                     android:paddingLeft="@dimen/ui_DIMEN_20.0PX"
                     android:paddingRight="@dimen/ui_DIMEN_20.0PX">
                     android:paddingRight="@dimen/ui_DIMEN_20.0PX">
+                    <LinearLayout
+                        android:id="@+id/ll_videoPlay_back"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        >
 
 
                     <ImageView
                     <ImageView
                         android:id="@+id/img_videoPlay_back"
                         android:id="@+id/img_videoPlay_back"
@@ -76,6 +81,7 @@
                         android:gravity="center"
                         android:gravity="center"
                         android:textColor="@color/white"
                         android:textColor="@color/white"
                         />
                         />
+                    </LinearLayout>
                     <TextView
                     <TextView
                         android:id="@+id/tv_videoPlay_className"
                         android:id="@+id/tv_videoPlay_className"
                         style="@style/ui_wrapTvBaseStyle"
                         style="@style/ui_wrapTvBaseStyle"
@@ -95,6 +101,13 @@
                     android:layout_alignParentRight="true"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentBottom="true"
                     android:layout_alignParentBottom="true"
                     />
                     />
+                <com.pili.pldroid.player.widget.PLVideoTextureView
+                    android:id="@+id/img_playVideo_pushreplay"
+                    android:layout_width="120dp"
+                    android:layout_height="150dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"
+                    />
                 <ImageView
                 <ImageView
                     android:id="@+id/img_playVideo_publishAudio"
                     android:id="@+id/img_playVideo_publishAudio"
                     android:layout_width="150dp"
                     android:layout_width="150dp"
@@ -164,7 +177,7 @@
         custom:tl_textUnselectColor="@color/home_tab_unselected"
         custom:tl_textUnselectColor="@color/home_tab_unselected"
 
 
         custom:tl_textsize="@dimen/ui_DIMEN_28.0PX"/>
         custom:tl_textsize="@dimen/ui_DIMEN_28.0PX"/>
-    <com.mang.xdy.demo.widget.view.NoScrollViewPager
+    <com.mang.xuedianyun.android.widget.view.NoScrollViewPager
         android:id="@+id/viewpager"
         android:id="@+id/viewpager"
         android:layout_below="@+id/stl_videoPlay_tab"
         android:layout_below="@+id/stl_videoPlay_tab"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
@@ -172,7 +185,7 @@
         android:layout_weight="1"
         android:layout_weight="1"
         android:background="@android:color/white" >
         android:background="@android:color/white" >
 
 
-        </com.mang.xdy.demo.widget.view.NoScrollViewPager>
+        </com.mang.xuedianyun.android.widget.view.NoScrollViewPager>
 
 
 
 
     <FrameLayout
     <FrameLayout

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:orientation="vertical"
-    tools:context="com.mang.xdy.demo.activity.VideoPlayActivity">
+    tools:context="com.mang.xuedianyun.android.activity.VideoPlayActivity">
     <RelativeLayout
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"

@@ -6,7 +6,7 @@
     android:background="#ebebeb"
     android:background="#ebebeb"
     android:orientation="vertical">
     android:orientation="vertical">
 
 
-    <com.mang.xdy.demo.widget.chat.KJChatKeyboard
+    <com.mang.xuedianyun.android.widget.chat.KJChatKeyboard
         android:id="@+id/chat_msg_input_box"
         android:id="@+id/chat_msg_input_box"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
     android:layout_height="match_parent">
-  <com.mang.xdy.demo.widget.CanvasView
+  <com.mang.xuedianyun.android.widget.CanvasView
       android:id="@+id/canvas_doc_show"
       android:id="@+id/canvas_doc_show"
       android:layout_width="wrap_content"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content" />
       android:layout_height="wrap_content" />

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.mang.xdy.demo.fragment.PublishFragment">
+    tools:context="com.mang.xuedianyun.android.fragment.PublishFragment">
 
 
     <!-- TODO: Update blank fragment layout -->
     <!-- TODO: Update blank fragment layout -->
     <SurfaceView
     <SurfaceView

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<com.mang.xdy.demo.widget.emoji.EmoticonsTextView
+<com.mang.xuedianyun.android.widget.emoji.EmoticonsTextView
     android:id="@+id/itemEmoji"
     android:id="@+id/itemEmoji"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="33dp"
     android:layout_width="33dp"

@@ -72,7 +72,7 @@
             android:layout_marginTop="@dimen/ui_DIMEN_8.0PX"
             android:layout_marginTop="@dimen/ui_DIMEN_8.0PX"
             android:layout_toRightOf="@id/chat_item_avatar">
             android:layout_toRightOf="@id/chat_item_avatar">
 
 
-            <com.mang.xdy.demo.widget.emoji.EmoticonsTextView
+            <com.mang.xuedianyun.android.widget.emoji.EmoticonsTextView
                 android:id="@+id/chat_item_content_text"
                 android:id="@+id/chat_item_content_text"
                 style="@style/home_chat_item_text_content"
                 style="@style/home_chat_item_text_content"
                 android:layout_centerInParent="true"
                 android:layout_centerInParent="true"

@@ -67,7 +67,7 @@
             android:layout_toLeftOf="@id/chat_item_avatar"
             android:layout_toLeftOf="@id/chat_item_avatar"
             android:gravity="end">
             android:gravity="end">
 
 
-            <com.mang.xdy.demo.widget.emoji.EmoticonsTextView
+            <com.mang.xuedianyun.android.widget.emoji.EmoticonsTextView
                 android:id="@+id/chat_item_content_text"
                 android:id="@+id/chat_item_content_text"
                 style="@style/home_chat_item_text_content"
                 style="@style/home_chat_item_text_content"
                 android:layout_centerVertical="true"
                 android:layout_centerVertical="true"

@@ -33,7 +33,7 @@
           android:visibility="gone"
           android:visibility="gone"
             android:button="@null"/>
             android:button="@null"/>
 
 
-        <com.mang.xdy.demo.widget.emoji.EmoticonsEditText
+        <com.mang.xuedianyun.android.widget.emoji.EmoticonsEditText
             android:id="@+id/toolbox_et_message"
             android:id="@+id/toolbox_et_message"
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="160dp"></android.support.v4.view.ViewPager>
             android:layout_height="160dp"></android.support.v4.view.ViewPager>
 
 
-        <com.mang.xdy.demo.widget.chat.PagerSlidingTabStrip
+        <com.mang.xuedianyun.android.widget.chat.PagerSlidingTabStrip
             android:id="@+id/toolbox_tabs"
             android:id="@+id/toolbox_tabs"
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_height="40dp"

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    tool:visibility="visible"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+    <LinearLayout
+        android:id="@+id/ll_exam_spreadOrfold"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginBottom="-20dp"
+        android:layout_gravity="right"
+        android:visibility="gone"
+        android:orientation="vertical">
+
+    </LinearLayout>
+    <CheckBox
+        android:id="@+id/cb_exam_spreadOrfold"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_marginBottom="-17dp"
+        android:layout_gravity="right"
+        android:button="@null"
+        android:drawableRight="@drawable/selector_exam_fold"/>
+    <!--<CheckBox-->
+        <!--android:id="@+id/cb_exam_A"-->
+        <!--style="@style/exam_cb_style_SingleOrMore"-->
+        <!--android:drawableLeft="@drawable/selector_exam"-->
+        <!--android:text="A" />-->
+    <!--倒计时-->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:background="#e3e3e3"
+        android:id="@+id/rel_exam_layout"
+        android:layout_height="90dp">
+        <RelativeLayout
+            android:id="@+id/rel_home_tv_exam_countdown"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/tv_exam_countdown"
+                android:layout_width="23dp"
+                android:layout_height="15dp"
+                android:layout_marginRight="5dp"
+                android:layout_alignParentLeft="true"
+                android:text="__s"
+                android:textSize="12dp"
+                android:textColor="@color/actionsheet_red"
+                android:background="@color/white"
+                />
+        </RelativeLayout>
+        <RelativeLayout
+            android:layout_marginLeft="5dp"
+            android:layout_toRightOf="@+id/rel_home_tv_exam_countdown"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+            <!--单选多选-->
+            <LinearLayout
+                android:id="@+id/ll_exam_SingleOrMore"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@+id/ll_exam_submit"
+                android:gravity="center"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                >
+                <CheckBox
+                    android:id="@+id/cb_exam_A"
+                    style="@style/exam_cb_style_SingleOrMore"
+                    android:drawableLeft="@drawable/selector_exam"
+                    android:text="A" />
+
+                <CheckBox
+                    android:id="@+id/cb_exam_B"
+                    style="@style/exam_cb_style_SingleOrMore"
+                    android:drawableLeft="@drawable/selector_exam"
+                    android:text="B" />
+
+                <CheckBox
+                    android:id="@+id/cb_exam_C"
+                    style="@style/exam_cb_style_SingleOrMore"
+                    android:drawableLeft="@drawable/selector_exam"
+                    android:text="C" />
+
+                <CheckBox
+                    android:id="@+id/cb_exam_D"
+                    style="@style/exam_cb_style_SingleOrMore"
+                    android:drawableLeft="@drawable/selector_exam"
+                    android:text="D" />
+            </LinearLayout>
+            <!--对错-->
+            <LinearLayout
+                android:id="@+id/ll_exam_selectRightOrWrong"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@+id/ll_exam_submit"
+                android:gravity="center"
+                android:visibility="gone"
+                tool:visibility="visible"
+                android:orientation="horizontal"
+                >
+                <RadioGroup
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    >
+                <RadioButton
+                    android:id="@+id/rb_exam_R"
+                    style="@style/exam_cb_style_RightOrWrong"
+                    android:drawableLeft="@drawable/selector_exam"
+                    android:checked="true"
+                    android:text="对" />
+
+                <RadioButton
+                    android:id="@+id/rb_exam_W"
+                    style="@style/exam_cb_style_RightOrWrong"
+                    android:drawableLeft="@drawable/selector_exam"
+                    android:text="错" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_exam_filling"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@+id/ll_exam_submit"
+                android:gravity="center"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="一"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="二"
+                    />
+
+                <EditText
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:maxLength="20"
+                    android:singleLine="true"
+                    android:hint="输入答案"
+                    />
+            </LinearLayout>
+
+
+            <!--答案-->
+            <LinearLayout
+                android:id="@+id/ll_exam_answer"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@+id/ll_exam_submit"
+                android:gravity="center|left"
+                android:visibility="gone"
+                tool:visibility="visible"
+                android:orientation="vertical"
+                >
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="我的答案:"
+                        />
+
+                    <LinearLayout
+                        android:id="@+id/ll_exam_Myanswer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+                    </LinearLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="正确答案:"
+                        />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:layout_margin="4dp"
+                        android:background="@mipmap/lv_bj"
+                        android:gravity="center"
+                        android:textColor="@android:color/white"
+                        android:text="C"
+                        android:visibility="gone"
+                        />
+                    <LinearLayout
+                        android:id="@+id/ll_exam_Correctanswer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="正确率："
+                        />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="20%"
+                        />
+                </LinearLayout>
+
+                </LinearLayout>
+            <!--提交-->
+            <LinearLayout
+                android:id="@+id/ll_exam_submit"
+                android:layout_width="100dp"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_alignParentRight="true"
+                >
+                <TextView
+                    android:id="@+id/tv_exam_up"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="提交"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:background="@drawable/shape_bg_full_circle_blue"
+                  android:layout_marginRight="10dp"
+                    android:textSize="12sp"
+                    />
+                <TextView
+                    android:id="@+id/tv_exam_cancle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="放弃"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:background="@drawable/shape_bg_full_circle_grey"
+                    android:layout_marginRight="8dp"
+                    android:textSize="12sp"
+                    />
+            </LinearLayout>
+        </RelativeLayout>
+    </RelativeLayout>
+    </LinearLayout>

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:background="#e3e3e3"
+    android:layout_height="match_parent">
+   <TextView
+       android:layout_width="match_parent"
+        android:text="wo jiusldjflkdjf"
+       android:layout_height="wrap_content" />
+</LinearLayout>

@@ -30,6 +30,8 @@
     <string name="home_title_back">Back</string>
     <string name="home_title_back">Back</string>
     <string name="home_msg_play_audio_init">Audio playback initialization</string>
     <string name="home_msg_play_audio_init">Audio playback initialization</string>
     <string name="home_msg_play_video_init">Video playback initialization</string>
     <string name="home_msg_play_video_init">Video playback initialization</string>
+
+    <string name="imge_load_error">Pictures for failure</string>
     <!--登录-->
     <!--登录-->
     <string name="main_login_error_classId">Please enter class number</string>
     <string name="main_login_error_classId">Please enter class number</string>
     <string name="main_login_error_portal">Please enter portal</string>
     <string name="main_login_error_portal">Please enter portal</string>

@@ -30,6 +30,8 @@
     <string name="home_title_back">返回</string>
     <string name="home_title_back">返回</string>
     <string name="home_msg_play_audio_init">音频播放初始化</string>
     <string name="home_msg_play_audio_init">音频播放初始化</string>
     <string name="home_msg_play_video_init">视频播放初始化</string>
     <string name="home_msg_play_video_init">视频播放初始化</string>
+
+    <string name="imge_load_error">图片获取失败</string>
     <!--登录-->
     <!--登录-->
     <string name="main_login_error_classId">课堂Id不能为空</string>
     <string name="main_login_error_classId">课堂Id不能为空</string>
     <string name="main_login_error_portal">服务器地址不能为空</string>
     <string name="main_login_error_portal">服务器地址不能为空</string>

-package com.mang.xdy.demo;
+package com.mang.xuedianyun.android;
 
 
 import org.junit.Test;
 import org.junit.Test;
 
 

+<resources>
+    <string name="dialog_cancle">cancel</string>
+</resources>

-package com.mang.xdy;
+package com.mang.xuedianyun;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.InstrumentationRegistry;

-/*
- * SmartPlayer.java
- * SmartPlayer
- * 
- * Github: https://github.com/daniulive/SmarterStreaming
- * WebSite: http://www.daniulive.com
- *
- * Created by DaniuLive on 2015/09/26.
- * Copyright © 2014~2017 DaniuLive. All rights reserved.
- */
-
-package com.daniulive.smartplayer;
-
-import java.nio.ByteBuffer;
-
-import android.app.Activity;  
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.SurfaceView;
-  
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.eventhandle.SmartEventCallback;
-import com.videoengine.*;
-
-public class SmartPlayer extends Activity {
-	    
-    private SurfaceView sSurfaceView = null;   
-	
-	private long playerHandle = 0;
-	
-	private static final int PORTRAIT = 1;		//竖屏
-	private static final int LANDSCAPE = 2;		//横屏
-	private static final String TAG = "SmartPlayer";
-	
-	private SmartPlayerJni libPlayer = null;
-	
-	private int currentOrigentation = PORTRAIT;
-	
-	private boolean isPlaybackViewStarted = false;
-	
-	private String playbackUrl = null;
-	
-	private boolean isMute = false;
-	
-	private boolean isHardwareDecoder = false;
-	
-	Button btnPopInputText;
-	Button btnPopInputUrl;
-	Button btnMute;
-    Button btnStartStopPlayback;
-	Button btnHardwareDecoder;
-    TextView txtCopyright;
-    TextView txtQQQun;
-    
-    LinearLayout lLayout = null;
-    FrameLayout fFrameLayout = null;
-    
-    private Context myContext;
-	String url="rtmp://player.daniulive.com:1935/hls/stream";
-	static {  
-		System.loadLibrary("SmartPlayer");
-	}
-  
-    @Override protected void onCreate(Bundle icicle) {  
-        super.onCreate(icicle);  
-         url=getIntent().getStringExtra("url");
-      Log.i(TAG, "Run into OnCreate++");
-      Log.e("URl",url+"");
-      libPlayer = new SmartPlayerJni();
-         
-      myContext = this.getApplicationContext();
-
-	  boolean bViewCreated = CreateView();
-	    
-	   if(bViewCreated){
-		   inflateLayout(LinearLayout.VERTICAL);
-	   }
-    }
-    
-    /* For smartplayer demo app, the url is based on: baseURL + inputID
-     * For example: 
-     * baseURL: rtmp://player.daniulive.com:1935/hls/stream
-     * inputID: 123456 
-     * playbackUrl: rtmp://player.daniulive.com:1935/hls/stream123456
-     * */
-    private void GenerateURL(String id){
-    	if(id == null)
-    		return;
-    	
-    	if(id.equals("hks"))
-    	{
-    		playbackUrl = "rtmp://live.hkstv.hk.lxdns.com/live/hks";
-    		return;
-    	}
-    	
-    	btnStartStopPlayback.setEnabled(true);
-//    	String baseURL = "rtmp://player.daniulive.com:1935/hls/stream";
-    	String baseURL = url;
-
-    	playbackUrl = baseURL + id;
-    }
-    
-    private void SaveInputUrl(String url)
-    {
-    	playbackUrl = "";
-    	
-    	if ( url == null )
-    		return;
-    	
-    	// rtmp:/
-    	if ( url.length() < 8 )
-    	{
-    		Log.e(TAG, "Input full url error:" + url);
-    		return;
-    	}
-    	
-    	if ( !url.startsWith("rtmp://") && !url.startsWith("rtsp://"))
-    	{
-    	    Log.e(TAG, "Input full url error:" + url);
-    		return;
-    	}
-    		
-    	btnStartStopPlayback.setEnabled(true);
-    	playbackUrl = url;
-    	
-    	 Log.i(TAG, "Input full url:" + url);
-    }
-    
-    /* Popup InputID dialog */
-    private void PopDialog(){
-    	final EditText inputID = new EditText(this);
-    	inputID.setFocusable(true);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("如 rtmp://player.daniulive.com:1935/hls/stream123456,请输入123456").setView(inputID).setNegativeButton(
-                "取消", null);
-        builder.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-
-                    public void onClick(DialogInterface dialog, int which) {
-//                        String strID = inputID.getText().toString() ;
-						String strID = url;
-                    	GenerateURL(strID);
-                    }
-                });
-        builder.show();
-    }
-    
-    
-    private void PopFullUrlDialog(){
-    	final EditText inputUrlTxt = new EditText(this);
-    	inputUrlTxt.setFocusable(true);
-    	inputUrlTxt.setText(url+"");
-
-        AlertDialog.Builder builderUrl = new AlertDialog.Builder(this);
-        builderUrl.setTitle(""+url).setView(inputUrlTxt).setNegativeButton(
-                "取消", null);
-        builderUrl.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-
-                    public void onClick(DialogInterface dialog, int which) {
-						//TODO 这个位置是修改的
-                        String fullUrl =url;
-//                        String fullUrl = inputUrlTxt.getText().toString();
-                        SaveInputUrl(fullUrl);
-                    }
-                });
-        builderUrl.show();
-    }
-    
-    /* Generate basic layout */
-    private void inflateLayout(int orientation) {
-    	if (null == lLayout)
-            lLayout = new LinearLayout(this);
-
-	    addContentView(lLayout,  new LayoutParams(LayoutParams.WRAP_CONTENT,
-	      LayoutParams.WRAP_CONTENT));
-    	
-        lLayout.setOrientation(orientation);
-   
-        fFrameLayout = new FrameLayout(this);
-        
-        LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT, 1.0f);
-        fFrameLayout.setLayoutParams(lp);
-        Log.i(TAG, "++inflateLayout..");
-               
-        sSurfaceView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));       
-        
-        fFrameLayout.addView(sSurfaceView, 0);
-
-        RelativeLayout outLinearLayout = new RelativeLayout(this);
-        outLinearLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.FILL_PARENT));
-        
-        LinearLayout lLinearLayout = new LinearLayout(this);
-        lLinearLayout.setOrientation(LinearLayout.VERTICAL);
-        lLinearLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
- 
-                
-        LinearLayout copyRightLinearLayout = new LinearLayout(this);
-        copyRightLinearLayout.setOrientation(LinearLayout.VERTICAL);
-        RelativeLayout.LayoutParams rl = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        rl.topMargin = getWindowManager().getDefaultDisplay().getHeight()-270;
-        copyRightLinearLayout.setLayoutParams(rl);
- 
-        txtCopyright=new TextView(this);
-        txtCopyright.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        txtCopyright.setText("Copyright 2014~2016 www.daniulive.com v1.0.16.0326");
-        copyRightLinearLayout.addView(txtCopyright, 0);
-        		
-        txtQQQun=new TextView(this);
-        txtQQQun.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        txtQQQun.setText("学点云");
-        copyRightLinearLayout.addView(txtQQQun, 1);
-        
-        /* PopInput button */
-        btnPopInputText = new Button(this);
-        btnPopInputText.setText("输入urlID");
-        btnPopInputText.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        lLinearLayout.addView(btnPopInputText, 0);
-        
-        btnPopInputUrl = new Button(this);
-        btnPopInputUrl.setText("输入完整url");
-        btnPopInputUrl.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        lLinearLayout.addView(btnPopInputUrl, 1);
-        
-        /*mute button */
-        isMute = false;
-        btnMute = new Button(this);
-        btnMute.setText("静音 ");
-        btnMute.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        lLinearLayout.addView(btnMute, 2);
-        
-        /*hardware decoder button */
-        isHardwareDecoder = false;
-        btnHardwareDecoder = new Button(this);
-        btnHardwareDecoder.setText("当前软解码");
-        btnHardwareDecoder.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        lLinearLayout.addView(btnHardwareDecoder, 3);
-        
-        /* Start playback stream button */
-        btnStartStopPlayback = new Button(this);
-        btnStartStopPlayback.setText("开始播放 ");
-        btnStartStopPlayback.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        lLinearLayout.addView(btnStartStopPlayback, 4);
- 
-       
-        outLinearLayout.addView(lLinearLayout, 0);
-        outLinearLayout.addView(copyRightLinearLayout, 1);
-        fFrameLayout.addView(outLinearLayout, 1);
-
-        lLayout.addView(fFrameLayout, 0);
-  
-        if(isPlaybackViewStarted)
-        {
-        	btnPopInputText.setEnabled(false);
-        	btnPopInputUrl.setEnabled(false);
-        	btnHardwareDecoder.setEnabled(false);
-        	btnStartStopPlayback.setText("停止播放 ");
-        }
-        else
-        {
-        	btnPopInputText.setEnabled(true);
-        	btnPopInputUrl.setEnabled(true);
-        	btnHardwareDecoder.setEnabled(true);
-        	btnStartStopPlayback.setText("开始播放 ");
-        }
-        
-        /* PopInput button listener */
-        btnPopInputText.setOnClickListener(new Button.OnClickListener() {  
-        	  
-            //  @Override  
-              public void onClick(View v) {  
-            	  Log.i(TAG, "Run into input playback ID++");
-	              
-            	  PopDialog();
-            	  
-            	  Log.i(TAG, "Run out from input playback ID--");
-              	}
-              });  
-        
-        
-        btnPopInputUrl.setOnClickListener(new Button.OnClickListener() { 
-        	 public void onClick(View v) { 
-        		 PopFullUrlDialog();
-        	 }
-        });
-        
-        btnMute.setOnClickListener(new Button.OnClickListener() 
-        { 
-       	 public void onClick(View v) { 
-    		 isMute = !isMute;
-    		 
-    		 if ( isMute )
-    		 {
-    			 btnMute.setText("取消静音");
-    		 }
-    		 else
-    		 {
-    			 btnMute.setText("静音");
-    		 }
-    		 
-    		 if ( playerHandle != 0 )
-    		 {
-    			 libPlayer.SmartPlayerSetMute(playerHandle, isMute?1:0);
-    		 }
-    	 }
-       });
-
-        btnHardwareDecoder.setOnClickListener(new Button.OnClickListener() 
-        { 
-       	 public void onClick(View v) { 
-    		 isHardwareDecoder = !isHardwareDecoder;
-    		 
-    		 if ( isHardwareDecoder )
-    		 {
-    			 btnHardwareDecoder.setText("当前硬解码");
-    		 }
-    		 else
-    		 {
-    			 btnHardwareDecoder.setText("当前软解码");
-    		 }
-    		 
-    	 }
-       });
-        
-        btnStartStopPlayback.setOnClickListener(new Button.OnClickListener() {  
-        	  
-            //  @Override  
-              public void onClick(View v) {  
-	              
-            	  if(isPlaybackViewStarted)
-            	  {
-                	  Log.i(TAG, "Stop playback stream++");
-            		  btnStartStopPlayback.setText("开始播放 ");
-            		  btnPopInputText.setEnabled(true);
-            		  btnPopInputUrl.setEnabled(true);
-            		  btnHardwareDecoder.setEnabled(true);
-            		  libPlayer.SmartPlayerClose(playerHandle);	
-            		  playerHandle = 0;
-            		  isPlaybackViewStarted = false;
-                      Log.i(TAG, "Stop playback stream--");
-            	  }
-            	  else
-            	  {
-            		  Log.i(TAG, "Start playback stream++");
-            		  
-            		  playerHandle = libPlayer.SmartPlayerInit(myContext);
-            	      
-            	      if(playerHandle == 0)
-            	      {
-            	    	  Log.e(TAG, "surfaceHandle with nil..");
-            	    	  return;
-            	      }
-            		  
-					  libPlayer.SetSmartPlayerEventCallback(playerHandle, new EventHande());
-					  
-            	      libPlayer.SmartPlayerSetSurface(playerHandle, sSurfaceView); 	//if set the second param with null, it means it will playback audio only..
-            		  	
-            	      // libPlayer.SmartPlayerSetSurface(playerHandle, null); 
-            	      
-            	      // External Render test
-            	      //libPlayer.SmartPlayerSetExternalRender(playerHandle, new RGBAExternalRender());
-            	      //libPlayer.SmartPlayerSetExternalRender(playerHandle, new I420ExternalRender());
- 	              	 
-            	      libPlayer.SmartPlayerSetAudioOutputType(playerHandle, 0);
-            	      
-            	      libPlayer.SmartPlayerSetBuffer(playerHandle, 200);
-            	      
-            	      if ( isMute )
-            	      {
-            	    	  libPlayer.SmartPlayerSetMute(playerHandle, isMute?1:0);
-            	      }
-            	      
-            	      if( isHardwareDecoder )
-            	      {
-            	    	  Log.i(TAG, "check isHardwareDecoder: " + isHardwareDecoder);
-            	    	  
-                	      int hwChecking = libPlayer.SetSmartPlayerVideoHWDecoder(playerHandle, isHardwareDecoder?1:0);
-  						
-    					  Log.i(TAG, "[daniulive] hwChecking: " + hwChecking);
-            	      }
-
-            	      //It only used when playback RTSP stream..
-            	     // libPlayer.SmartPlayerSetRTSPTcpMode(playerHandle, 1);
-     
-					  //playbackUrl = "rtmp://live.hkstv.hk.lxdns.com/live/hks";
-            	                  	      
-            	      //playbackUrl = "rtsp://rtsp-v3-spbtv.msk.spbtv.com/spbtv_v3_1/214_110.sdp";
-
-					  //playbackUrl = "rtmp://10.2.68.91:1935/hls/stream8";
-
-	              	  if(playbackUrl == null){
-	              		 Log.e(TAG, "playback URL with NULL..."); 
-	              		 return;
-	              	  }
-	              	  
-	              	  int iPlaybackRet = libPlayer.SmartPlayerStartPlayback(playerHandle, playbackUrl);
-	              	  	              	  
-	                  if(iPlaybackRet != 0)
-	                  {
-	                	 Log.e(TAG, "StartPlayback strem failed.."); 
-	                	 return;
-	                  }
-	
-	        		  btnStartStopPlayback.setText("停止播放 ");
-	                  btnPopInputText.setEnabled(false);
-	                  btnPopInputUrl.setEnabled(false);
-	                  btnHardwareDecoder.setEnabled(false);
-	              	  isPlaybackViewStarted = true;
-	              	  Log.i(TAG, "Start playback stream--");
-	        	  }
-	          	}
-              });
-	}
-	
-    
-    public static final String bytesToHexString(byte[] buffer)
-    {   
-        StringBuffer sb = new StringBuffer(buffer.length);   
-        String temp;
-        
-        for (int i = 0; i < buffer.length; ++i)
-        {   
-        	temp = Integer.toHexString(0xff&buffer[i]);   
-          if (temp.length() < 2)   
-            sb.append(0);
-          
-          sb.append(temp);   
-        }   
-        
-        return sb.toString();   
-    }  
-    
-    class RGBAExternalRender implements NTExternalRender 
-    {
-    	//public static final int NT_FRAME_FORMAT_RGBA = 1;
-    	//public static final int NT_FRAME_FORMAT_ABGR = 2;
-    	//public static final int NT_FRAME_FORMAT_I420 = 3;
-    	
-    	private int width_ = 0;
-    	private int height_ = 0;
-    	private int row_bytes_ = 0;
-    	private ByteBuffer rgba_buffer_ = null;
-
-    	@Override
-    	public int getNTFrameFormat()
-    	{
-    		Log.i(TAG, "RGBAExternalRender::getNTFrameFormat return "+ NT_FRAME_FORMAT_RGBA);
-    		return NT_FRAME_FORMAT_RGBA;
-    	}
-
-    	@Override
-    	public void onNTFrameSizeChanged(int width, int height)
-    	{
-    		width_ = width;
-    		height_ = height;
-    		
-    		row_bytes_ = width_ * 4;
-    		
-    		Log.i(TAG, "RGBAExternalRender::onNTFrameSizeChanged width_:" + width_ + " height_:" + height_);
-    		
-    		rgba_buffer_ = ByteBuffer.allocateDirect(row_bytes_*height_);
-    	}
-
-    	@Override
-    	public ByteBuffer getNTPlaneByteBuffer(int index)
-    	{
-    		if ( index == 0 )
-    		{
-    			return rgba_buffer_;
-    		}
-    		else
-    		{
-    			Log.e(TAG, "RGBAExternalRender::getNTPlaneByteBuffer index error:" + index);
-    			return null;
-    		}
-    	}
-
-    	@Override
-    	public int getNTPlanePerRowBytes(int index)
-    	{
-    		if ( index == 0 )
-    		{
-    			return row_bytes_;
-    		}
-    		else
-    		{
-    			Log.e(TAG, "RGBAExternalRender::getNTPlanePerRowBytes index error:" + index);
-    			return 0;
-    		}
-    	}
-
-    	public void onNTRenderFrame()
-    	{
-    		 if( rgba_buffer_ == null )
-    	            return;
-    		 
-    		 rgba_buffer_.rewind();
-    		 
-    		 // copy buffer
-    		 
-    		 // test
-    		// byte[] test_buffer = new byte[16];
-    		// rgba_buffer_.get(test_buffer);
-    		 
-    		 //Log.i(TAG, "RGBAExternalRender:onNTRenderFrame rgba:" + bytesToHexString(test_buffer));
-    	}
-    }
-    
-    class I420ExternalRender implements NTExternalRender
-    {
-    	//public static final int NT_FRAME_FORMAT_RGBA = 1;
-    	//public static final int NT_FRAME_FORMAT_ABGR = 2;
-    	//public static final int NT_FRAME_FORMAT_I420 = 3;
-    	
-    	private int width_ = 0;
-    	private int height_ = 0;
-    	
-    	private int y_row_bytes_ = 0;
-    	private int u_row_bytes_ = 0;
-    	private int v_row_bytes_ = 0;
-    	
-    	private ByteBuffer y_buffer_ = null;
-    	private ByteBuffer u_buffer_ = null;
-    	private ByteBuffer v_buffer_ = null; 
-    	
-    	@Override
-    	public int getNTFrameFormat()
-    	{
-    		Log.i(TAG, "I420ExternalRender::getNTFrameFormat return "+ NT_FRAME_FORMAT_I420);
-    		return NT_FRAME_FORMAT_I420;
-    	}
-
-    	@Override
-    	public void onNTFrameSizeChanged(int width, int height)
-    	{
-    		width_ = width;
-    		height_ = height;
-    		
-    		y_row_bytes_ = (width_ + 15) & (~15);
-    		u_row_bytes_ = ((width_+1)/2 + 15) & (~15);
-    		v_row_bytes_ = ((width_+1)/2 + 15) & (~15);
-    		
-    		y_buffer_ = ByteBuffer.allocateDirect(y_row_bytes_*height_);
-    		u_buffer_ = ByteBuffer.allocateDirect(u_row_bytes_*(height_+1)/2);
-    		v_buffer_ = ByteBuffer.allocateDirect(v_row_bytes_*(height_+1)/2);
-    		
-    		Log.i(TAG, "I420ExternalRender::onNTFrameSizeChanged width_=" 
-    		    + width_ + " height_=" + height_ 
-    		    + " y_row_bytes_=" +  y_row_bytes_
-    		    + " u_row_bytes_=" + u_row_bytes_
-    		    + " v_row_bytes_=" + v_row_bytes_);
-    	}
-
-    	@Override
-    	public ByteBuffer getNTPlaneByteBuffer(int index)
-    	{
-    		if ( index == 0 )
-    		{
-    			return y_buffer_;
-    		}
-    		else if ( index == 1 )
-    		{
-    			return u_buffer_;
-    		}
-    		else if ( index == 2 )
-    		{
-    			return v_buffer_;
-    		}
-    		else
-    		{
-    			Log.e(TAG, "I420ExternalRender::getNTPlaneByteBuffer index error:" + index);
-    			return null;
-    		}
-    	}
-
-    	@Override
-    	public int getNTPlanePerRowBytes(int index)
-    	{
-    		if ( index == 0 )
-    		{
-    			return y_row_bytes_;
-    		}
-    		else if ( index == 1)
-    		{
-    			return u_row_bytes_;
-    		}
-    		else if (index == 2 )
-    		{
-    			return v_row_bytes_;
-    		}
-    		else
-    		{
-    			Log.e(TAG, "I420ExternalRender::getNTPlanePerRowBytes index error:" + index);
-    			return 0;
-    		}
-    	}
-
-    	public void onNTRenderFrame()
-    	{
-    		if ( y_buffer_ == null )
-    			return;
-    		
-    		if ( u_buffer_ == null )
-    			return;
-    		
-    		if ( v_buffer_ == null )
-    			return;
-    		
-      
-    		y_buffer_.rewind();
-    		
-    		u_buffer_.rewind();
-    		
-    		v_buffer_.rewind();
-    		
-    		 // copy buffer
-    		
-    		// test
-    		// byte[] test_buffer = new byte[16];
-    		// y_buffer_.get(test_buffer);
-    		 
-    		// Log.i(TAG, "I420ExternalRender::onNTRenderFrame y data:" + bytesToHexString(test_buffer));
-    		 
-    		// u_buffer_.get(test_buffer);
-    		// Log.i(TAG, "I420ExternalRender::onNTRenderFrame u data:" + bytesToHexString(test_buffer));
-    		 
-    		// v_buffer_.get(test_buffer);
-    		// Log.i(TAG, "I420ExternalRender::onNTRenderFrame v data:" + bytesToHexString(test_buffer));
-    	}
-    }
-    
-    
-    class EventHande implements SmartEventCallback
-    {
-    	 @Override
-    	 public void onCallback(int code, long param1, long param2, String param3, String param4, Object param5){
-             switch (code) {
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_STARTED:
-                     Log.i(TAG, "开始。。");
-                     break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTING:
-                     Log.i(TAG, "连接中。。");
-                     break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTION_FAILED:
-                     Log.i(TAG, "连接失败。。");
-                     break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTED:
-                     Log.i(TAG, "连接成功。。");
-                     break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_DISCONNECTED:
-                     Log.i(TAG, "连接断开。。");
-                     break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_STOP:
-                     Log.i(TAG, "关闭。。");
-                     break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_RESOLUTION_INFO:
-                	 Log.i(TAG, "分辨率信息: width: " + param1 + ", height: " + param2);
-                	 break;
-                 case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_NO_MEDIADATA_RECEIVED:
-                	 Log.i(TAG, "收不到媒体数据，可能是url错误。。");
-             }
-    	 }
-    }
-    
-    /* Create rendering */
-    private boolean CreateView() {
-    	
-        if(sSurfaceView == null)
-        {
-        	 /*
-             *  useOpenGLES2:
-             *  If with true: Check if system supports openGLES, if supported, it will choose openGLES.
-             *  If with false: it will set with default surfaceView;	
-             */
-        	sSurfaceView = NTRenderer.CreateRenderer(this, true);
-        }
-        
-        if(sSurfaceView == null)
-        {
-        	Log.i(TAG, "Create render failed..");
-        	return false;
-        }
-
-        return true;
-	}
-    
-	@Override  
-    public void onConfigurationChanged(Configuration newConfig) {  
-            super.onConfigurationChanged(newConfig);  
-            
-            Log.i(TAG, "Run into onConfigurationChanged++");
-            
-            if (null != fFrameLayout)
-            {
-            	fFrameLayout.removeAllViews();
-            	fFrameLayout = null;
-            }
-            
-            if (null != lLayout)
-            {
-                lLayout.removeAllViews();
-                lLayout = null;
-            }
-            
-            if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) 
-            {   
-            	Log.i(TAG, "onConfigurationChanged, with LANDSCAPE。。");
-
-            	inflateLayout(LinearLayout.HORIZONTAL);
-                 
-            	currentOrigentation = LANDSCAPE;
-            } 
-            else
-            {  
-            	Log.i(TAG, "onConfigurationChanged, with PORTRAIT。。"); 
-            	
-            	inflateLayout(LinearLayout.VERTICAL);
-            	
-            	currentOrigentation = PORTRAIT;
-            }  
-            
-            if(!isPlaybackViewStarted)
-            	return;
-            
-            libPlayer.SmartPlayerSetOrientation(playerHandle, currentOrigentation);
-
-            Log.i(TAG, "Run out of onConfigurationChanged--");
-    }
-    
-	@Override
-    protected  void onDestroy()
-	{
-		Log.i(TAG, "Run into activity destory++");   	
-    	
-		if(playerHandle!=0)
-		{
-			libPlayer.SmartPlayerClose(playerHandle);	
-			playerHandle = 0;
-		}
-		super.onDestroy();
-    	finish();
-//    	System.exit(0);
-    }
-}

@@ -23,6 +23,15 @@ public class VideoPlayBean {
     private String rtmpUrl;
     private String rtmpUrl;
     private String replay;
     private String replay;
     private int seek;
     private int seek;
+    private String userRole;
+
+    public String getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(String userRole) {
+        this.userRole = userRole;
+    }
 
 
     public int getMediaId() {
     public int getMediaId() {
         return mediaId;
         return mediaId;
@@ -79,4 +88,18 @@ public class VideoPlayBean {
     public void setSeek(int seek) {
     public void setSeek(int seek) {
         this.seek = seek;
         this.seek = seek;
     }
     }
+
+    @Override
+    public String toString() {
+        return "VideoPlayBean{" +
+                "mediaId=" + mediaId +
+                ", fromNodeId=" + fromNodeId +
+                ", userName='" + userName + '\'' +
+                ", m3u8Url='" + m3u8Url + '\'' +
+                ", rtmpUrl='" + rtmpUrl + '\'' +
+                ", replay='" + replay + '\'' +
+                ", seek=" + seek +
+                ", userRole='" + userRole + '\'' +
+                '}';
+    }
 }
 }

@@ -182,6 +182,11 @@ public interface Constants {
      * 开始录制回放
      * 开始录制回放
      */
      */
     String START_RECORD_PLAY_BACK="startRecordPlayback";
     String START_RECORD_PLAY_BACK="startRecordPlayback";
+    /**
+     * 主持人角色
+     */
+    String HOST="host";
+
     String UN_PUBLISH_VIDEO="unPublishVideo";
     String UN_PUBLISH_VIDEO="unPublishVideo";
     /*Context为空的时候给出的提示*/
     /*Context为空的时候给出的提示*/
      String ERROR_CONTENT_NULL="Xdy,init context is null";
      String ERROR_CONTENT_NULL="Xdy,init context is null";

@@ -7,20 +7,14 @@ package com.mang.xdy.core;
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Build;
-import android.text.NoCopySpan;
-import android.text.TextUtils;
 import android.webkit.JavascriptInterface;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.webkit.WebViewClient;
 
 
-import com.mang.xdy.common.Constants;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyLogUtil;
-import com.mang.xdy.utils.XdyStringUtils;
 
 
 /**
 /**
  * 数据的异常检测都放在最外层（便于给用户提示），这层默认数据都是完整
  * 数据的异常检测都放在最外层（便于给用户提示），这层默认数据都是完整
@@ -125,10 +119,10 @@ public  class XdyJsCore {
         @JavascriptInterface
         @JavascriptInterface
         public void _js2native(String id,String parmp){
         public void _js2native(String id,String parmp){
           /*  _native2js("接口名称","参数为JOSN字符串")*/
           /*  _native2js("接口名称","参数为JOSN字符串")*/
-         //   XdyLogUtil.e("s3sjs2native","id:"+id+"  parmp:"+parmp);
-            if(mOnXdyAsyncMessageListener !=null){
-                mOnXdyAsyncMessageListener.getSdyAsyncMessageListener(id,parmp);
-            }
+            XdyLogUtil.e("s3sjs2native","id:"+id+"  parmp:"+parmp);
+//            if(mOnXdyAsyncMessageListener !=null){
+//                mOnXdyAsyncMessageListener.getSdyAsyncMessageListener(id,parmp);
+//            }
               XdySdk.getXdyInstance().notifyObserver(id, parmp);
               XdySdk.getXdyInstance().notifyObserver(id, parmp);
         }
         }
     }
     }

@@ -10,22 +10,22 @@ import android.view.SurfaceView;
 
 
 import com.eventhandle.SmartEventCallback;
 import com.eventhandle.SmartEventCallback;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
-import com.mang.xdy.bean.AudioPlayBean;
-import com.mang.xdy.bean.ErrorCodeEntity;
 import com.mang.xdy.bean.GetPublishPathReceiveBean;
 import com.mang.xdy.bean.GetPublishPathReceiveBean;
 import com.mang.xdy.bean.PublisherSuccessEntity;
 import com.mang.xdy.bean.PublisherSuccessEntity;
-import com.mang.xdy.bean.PublisherVideoReturnBean;
 import com.mang.xdy.bean.VideoPlayBean;
 import com.mang.xdy.bean.VideoPlayBean;
-import com.mang.xdy.cache.ACache;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.common.Constants;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.listener.ObserverListener;
 import com.mang.xdy.listener.SubjectListener;
 import com.mang.xdy.listener.SubjectListener;
-import com.mang.xdy.message.MsgManage;
 import com.mang.xdy.play.XdyPlayer;
 import com.mang.xdy.play.XdyPlayer;
-import com.mang.xdy.play.XdyPublisher;
 import com.mang.xdy.utils.JsonUtil;
 import com.mang.xdy.utils.JsonUtil;
-import com.mang.xdy.utils.NetWorkUtils;
 import com.mang.xdy.utils.PlayerUtils;
 import com.mang.xdy.utils.PlayerUtils;
+import com.mang.xdy.bean.AudioPlayBean;
+import com.mang.xdy.bean.ErrorCodeEntity;
+import com.mang.xdy.bean.PublisherVideoReturnBean;
+import com.mang.xdy.cache.ACache;
+import com.mang.xdy.message.MsgManage;
+import com.mang.xdy.play.XdyPublisher;
+import com.mang.xdy.utils.NetWorkUtils;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyLogUtil;
 import com.mang.xdy.utils.XdyStringUtils;
 import com.mang.xdy.utils.XdyStringUtils;
 
 
@@ -35,16 +35,12 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import static com.mang.xdy.utils.PlayerUtils.getPublishPathAudio;
-import static com.mang.xdy.utils.PlayerUtils.getPublishPathVideo;
-
 /**
 /**
- * 对外调用的接口
- * Created by abao on 2017/3/31.
+ * 对外调用的接
  * 受原先的文档设计的规则，所有方法的都是静态的方法，影响性能
  * 受原先的文档设计的规则，所有方法的都是静态的方法，影响性能
  * 考虑跟换文档，提升性能
  * 考虑跟换文档，提升性能
  */
  */
-public  class XdySdk implements SubjectListener{
+public  class XdySdk implements SubjectListener {
     /**
     /**
      * 用户初始化，还是调用各种方法，都需要统一的对外给出监听事件
      * 用户初始化，还是调用各种方法，都需要统一的对外给出监听事件
      */
      */
@@ -78,6 +74,9 @@ public  class XdySdk implements SubjectListener{
     private String publish_url="";
     private String publish_url="";
     /*保存nodeid ,自己的唯一标识*/
     /*保存nodeid ,自己的唯一标识*/
     private int mNodeId =0;
     private int mNodeId =0;
+   /*z正在播放视频 onStop 重置状态,是否是Host 在播放视频，这个优先级最高,1v1 产物*/
+    private boolean isCurrentVideoHost=false;
+    private boolean isCurrentAudioHost=false;
 
 
     @Override
     @Override
     public void add(ObserverListener observerListener) {
     public void add(ObserverListener observerListener) {
@@ -106,7 +105,7 @@ public  class XdySdk implements SubjectListener{
         @Override
         @Override
         public void handleMessage(Message msg) {
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             super.handleMessage(msg);
-            if(msg.what==Constants.LEAVE_CLASS_CODE){
+            if(msg.what== Constants.LEAVE_CLASS_CODE){
                 if(!NetWorkUtils.isNetworkConnected(mContext)) {
                 if(!NetWorkUtils.isNetworkConnected(mContext)) {
                     if (mXdySdk != null) {
                     if (mXdySdk != null) {
                         mXdySdk.onPublisherStop();
                         mXdySdk.onPublisherStop();
@@ -147,8 +146,12 @@ public  class XdySdk implements SubjectListener{
                 break;
                 break;
             case "stopAudio":
             case "stopAudio":
                 //停止播放audio（）
                 //停止播放audio（）
+                isCurrentAudioHost=false;
+                onPlayDestroy();
+                break;
             case"stopVideo":
             case"stopVideo":
                 //停止播放video（ 停止播放：根据api）
                 //停止播放video（ 停止播放：根据api）
+                isCurrentVideoHost=false;
                 onPlayDestroy();
                 onPlayDestroy();
                 break;
                 break;
         }
         }
@@ -187,13 +190,22 @@ public  class XdySdk implements SubjectListener{
                     XdyLogUtil.e(TAG,"Play Audio Can not find this mediaId");
                     XdyLogUtil.e(TAG,"Play Audio Can not find this mediaId");
                     return;
                     return;
                 }
                 }
-                currentPlayId=mediaId;
-                AudioPlayBean audioPlayBean=JsonUtil.parseJsonToBean(json_audio,AudioPlayBean.class);
+
+                AudioPlayBean audioPlayBean= JsonUtil.parseJsonToBean(json_audio,AudioPlayBean.class);
                 if(audioPlayBean!=null) {
                 if(audioPlayBean!=null) {
                     String play_url_audio="";
                     String play_url_audio="";
                     if(isRecordPlayBack){
                     if(isRecordPlayBack){
                        //如果是回放给出。m3u8的id用户 用户需要自己获取play_url_audio=audioPlayBean.getReplay();
                        //如果是回放给出。m3u8的id用户 用户需要自己获取play_url_audio=audioPlayBean.getReplay();
                     }else{
                     }else{
+                        //如果是host权限的在播放，下次在播放必须是host
+                        if(isCurrentAudioHost){
+                            if(!Constants.HOST.equals(audioPlayBean.getUserRole())){
+                                return;
+                            }
+                        }
+                        if(Constants.HOST.equals(audioPlayBean.getUserRole())){
+                            isCurrentAudioHost=true;
+                        }
                         play_url_audio=audioPlayBean.getRtmpUrl() ;
                         play_url_audio=audioPlayBean.getRtmpUrl() ;
                         if(mXdyPlayer ==null) {
                         if(mXdyPlayer ==null) {
                             mXdyPlayer = XdyPlayer.getXdyPlayerCore(play_url_audio, activity);
                             mXdyPlayer = XdyPlayer.getXdyPlayerCore(play_url_audio, activity);
@@ -201,6 +213,7 @@ public  class XdySdk implements SubjectListener{
                             mXdyPlayer.onStopPlay();
                             mXdyPlayer.onStopPlay();
                         }
                         }
                         mXdyPlayer.playAudio(play_url_audio, new EventHande_Play());
                         mXdyPlayer.playAudio(play_url_audio, new EventHande_Play());
+                        currentPlayId=mediaId;
                     }
                     }
 
 
                 }else{
                 }else{
@@ -216,13 +229,22 @@ public  class XdySdk implements SubjectListener{
                     XdyLogUtil.e(TAG,"Play Video Can not find this mediaId");
                     XdyLogUtil.e(TAG,"Play Video Can not find this mediaId");
                     return;
                     return;
                 }
                 }
-                currentPlayId=mediaId;
+
                 VideoPlayBean videoPlayBean=JsonUtil.parseJsonToBean(json_video,VideoPlayBean.class);
                 VideoPlayBean videoPlayBean=JsonUtil.parseJsonToBean(json_video,VideoPlayBean.class);
                 if(videoPlayBean!=null){
                 if(videoPlayBean!=null){
                     String play_url_video="";
                     String play_url_video="";
                     if(isRecordPlayBack){
                     if(isRecordPlayBack){
 //                        play_url_video=videoPlayBean.getReplay();
 //                        play_url_video=videoPlayBean.getReplay();
                     }else{
                     }else{
+                        //如果是host权限的在播放，下次在播放必须是host
+                        if(isCurrentVideoHost){
+                            if(!Constants.HOST.equals(videoPlayBean.getUserRole())){
+                                return;
+                            }
+                        }
+                        if(Constants.HOST.equals(videoPlayBean.getUserRole())){
+                            isCurrentVideoHost=true;
+                        }
                         play_url_video=videoPlayBean.getRtmpUrl();
                         play_url_video=videoPlayBean.getRtmpUrl();
                         if(mXdyPlayer ==null) {
                         if(mXdyPlayer ==null) {
                             mXdyPlayer = XdyPlayer.getXdyPlayerCore(play_url_video, activity);
                             mXdyPlayer = XdyPlayer.getXdyPlayerCore(play_url_video, activity);
@@ -231,6 +253,7 @@ public  class XdySdk implements SubjectListener{
                             mXdyPlayer.onStopPlay();
                             mXdyPlayer.onStopPlay();
                         }
                         }
                         mXdyPlayer.playVideo(play_url_video, surfaceView,new EventHande_Play());
                         mXdyPlayer.playVideo(play_url_video, surfaceView,new EventHande_Play());
+                        currentPlayId=mediaId;
                     }
                     }
 
 
                 }else{
                 }else{
@@ -245,13 +268,13 @@ public  class XdySdk implements SubjectListener{
                  *  2，判断地址时候有用，有用的话打开播放器，开启推流的过程
                  *  2，判断地址时候有用，有用的话打开播放器，开启推流的过程
                  *  3，推流成功告知后台，和用户
                  *  3，推流成功告知后台，和用户
                  */
                  */
-                getPublishPathVideo();
+                PlayerUtils.getPublishPathVideo();
                 mSurfaceView_Publish=surfaceView;
                 mSurfaceView_Publish=surfaceView;
                 mActivity=activity;
                 mActivity=activity;
                 break;
                 break;
             case Constants.PUBLISH_AUDIO:
             case Constants.PUBLISH_AUDIO:
                 //只推送音频
                 //只推送音频
-                getPublishPathAudio();
+                PlayerUtils.getPublishPathAudio();
                 mActivity=activity;
                 mActivity=activity;
                 break;
                 break;
 
 
@@ -301,7 +324,6 @@ public  class XdySdk implements SubjectListener{
          audio
          audio
         plublisher Video
         plublisher Video
         publisher Audio
         publisher Audio
-
         */
         */
         switch (type) {
         switch (type) {
             case Constants.CLASS_JOIN_SUCCESS:
             case Constants.CLASS_JOIN_SUCCESS:
@@ -530,6 +552,10 @@ public  class XdySdk implements SubjectListener{
                 mXdyPlayer.onStopPlay();
                 mXdyPlayer.onStopPlay();
 //                mXdyPlayer = null;
 //                mXdyPlayer = null;
 
 
+                isCurrentAudioHost=false;
+                isCurrentVideoHost=false;
+
+
             }
             }
             return true;
             return true;
         }
         }
@@ -545,6 +571,8 @@ public  class XdySdk implements SubjectListener{
         if(mXdyJsCore!=null&&!isRecordPlayBack) {
         if(mXdyJsCore!=null&&!isRecordPlayBack) {
             mXdyJsCore.init(mContext);
             mXdyJsCore.init(mContext);
         }
         }
+        isCurrentVideoHost=false;
+        isCurrentAudioHost=false;
         onPublisherStop();
         onPublisherStop();
     }
     }
 
 

+package com.mang.xdy.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+public class SPUtil {
+    private static SharedPreferences mSp;
+
+    private static SharedPreferences getSharedPreferences(Context context) {
+        if (mSp == null) {
+            mSp = context.getSharedPreferences("config", Context.MODE_PRIVATE);
+        }
+        return mSp;
+    }
+
+    public static void putBoolean(Context context, String key, boolean value) {
+        // SharedPreferences sp = mContext.getSharedPreferences("config",
+        // Context.MODE_PRIVATE);
+        getSharedPreferences(context).edit().putBoolean(key, value).commit();
+    }
+
+    public static boolean getBoolean(Context context, String key, boolean defValue) {
+        // SharedPreferences sp = mContext.getSharedPreferences("config",
+        // Context.MODE_PRIVATE);
+        return getSharedPreferences(context).getBoolean(key, defValue);
+    }
+
+    public static void putString(Context context, String key, String value) {
+        getSharedPreferences(context).edit().putString(key, value).commit();
+    }
+
+    public static String getString(Context context, String key, String defValue) {
+        return getSharedPreferences(context).getString(key, defValue);
+    }
+
+    public static void putInt(Context context, String key, int value) {
+        getSharedPreferences(context).edit().putInt(key, value).commit();
+    }
+
+    public static int getInt(Context context, String key, int defValue) {
+        return getSharedPreferences(context).getInt(key, defValue);
+    }
+
+    /**
+     * 移除一个字符串值
+     *
+     * @param context
+     * @param key
+     */
+    public static void removeString(Context context, String key) {
+        getSharedPreferences(context).edit().remove(key).commit();
+    }
+
+    /**
+     * 把流里的内容解析成字符串
+     *
+     * @param is
+     * @return
+     * @throws IOException
+     */
+    public static String streamToString(InputStream is) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = -1;
+        while ((len = is.read(buffer)) != -1) {
+            baos.write(buffer, 0, len);
+        }
+        String string = baos.toString();
+        baos.close();
+        is.close();
+        return string;
+    }
+    public static long getLong(String key,long defValue) {
+        return mSp.getLong(key, defValue);
+    }
+    public static void setLong(Context context, String key, Long value) {
+        getSharedPreferences(context).edit().putLong(key, value).commit();
+    }
+}

-package com.mang.xdy;
+package com.mang.xuedianyun;
 
 
 import org.junit.Test;
 import org.junit.Test;