Merge pull request #34 from ksvc/v2.2.6

update to v2.2.6

Author: buliaoyin

KSYLiveDemo/app/src/main/AndroidManifest.xml

@@ -33,7 +33,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:name="com.ksyun.media.streamer.demo.DemoApplication">
 
         <activity android:name="com.ksyun.live.demo.MainActivity">
             <intent-filter>
@@ -43,6 +44,11 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".player.activity.TextureVodActivity"
+            android:screenOrientation="landscape"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"></activity>
+
         <activity
             android:name="com.ksyun.live.demo.player.activity.TextureVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -52,14 +58,6 @@
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:configChanges="orientation|keyboardHidden|screenSize"
             />
-        <activity
-            android:name="com.ksyun.live.demo.player.activity.SurfaceActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
-        <activity
-            android:name="com.ksyun.live.demo.player.activity.KSYSurfaceActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
 
         <activity android:name=".player.activity.PlayerActivity" ></activity>
         <activity android:name="com.ksyun.live.demo.player.activity.NetMediaActivty" ></activity>

KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java

@@ -20,7 +20,7 @@
 /**
  * Created by liubohua on 16/7/20.
  */
-public class HistoryActivity extends Activity{
+public class HistoryActivity extends Activity {
     private ListView hislist;
     private ArrayList<String> listurl;
     private Cursor cursor;
@@ -31,6 +31,10 @@ public class HistoryActivity extends Activity{
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+//
+        settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
+//        SkinChangeUtil.changeSkin(this,settings.getString("choose_skin", "信息为空"));
+
         setContentView(R.layout.activity_history);
         listurl = new ArrayList<String>();
 
@@ -39,45 +43,30 @@ protected void onCreate(Bundle savedInstanceState) {
         NetDb.open();
         cursor = NetDb.getAllData();
         cursor.moveToFirst();
-        if(cursor.getCount()>0){
-            listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
+        if (cursor.getCount() > 0) {
+            listurl.add(cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
         }
-        while(cursor.moveToNext()){
-            listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
+        while (cursor.moveToNext()) {
+            listurl.add(cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
         }
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_expandable_list_item_1,listurl);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_expandable_list_item_1, listurl);
         hislist.setAdapter(adapter);
         hislist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 String path = listurl.get(i);
-
-                String chooseview;
-                settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
-                chooseview = settings.getString("choose_view","undefind");
-
-                if(chooseview.equals(Settings.USEKSYTEXTURE)){
-                    Intent intent = new Intent(HistoryActivity.this,TextureVideoActivity.class);
-                    intent.putExtra("path",path);
-                    startActivity(intent);
-
-                }
-                else if (chooseview.equals(Settings.USEKGLRENDER)){
-                    Intent intent = new Intent(HistoryActivity.this,TextureViewMediaActivity.class);
-                    intent.putExtra("path",path);
+                String playerType = settings.getString("choose_type", Settings.LIVE);
+                if (playerType.equals(Settings.VOD)) {
+                    Intent intent = new Intent(HistoryActivity.this, TextureVodActivity.class);
+                    intent.putExtra("path", path);
                     startActivity(intent);
-                }
-                else if (chooseview.equals(Settings.USEKSYVIVEW)){
-                    Intent intent = new Intent(HistoryActivity.this,KSYSurfaceActivity.class);
-                    intent.putExtra("path",path);
-                    startActivity(intent);
-                }
-                else{
-                    Intent intent = new Intent(HistoryActivity.this,SurfaceActivity.class);
-                    intent.putExtra("path",path);
+                } else {
+                    Intent intent = new Intent(HistoryActivity.this, TextureVideoActivity.class);
+                    intent.putExtra("path", path);
                     startActivity(intent);
                 }
+
             }
         });
 

KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java

@@ -8,10 +8,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.ksyun.live.demo.player.model.MyVideoThumbLoader;
 import com.ksyun.live.demo.R;
+import com.ksyun.live.demo.player.model.MyVideoThumbLoader;
 import com.ksyun.live.demo.player.util.Video;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,9 +62,14 @@ public View getView(int i, View view, ViewGroup viewGroup) {
             holder = (ViewHolder)view.getTag();
         }
         String path = listVideos.get(i).getPath();
-        holder.img.setTag(path);
-        mVideoThumbLoader.showThumbByAsyncTask(path, holder.img);
 
+        File file = new File(path);
+        if(file.isDirectory()){
+            holder.img.setImageResource(R.drawable.file);
+        }else{
+            holder.img.setTag(path);
+            mVideoThumbLoader.showThumbByAsyncTask(path, holder.img);
+        }
         holder.title.setText(listVideos.get(i).getTitle());
         holder.path.setText(listVideos.get(i).getPath());
         return view;