短视频新增上传图片功能，完善短视频列表

王琳
1 parent 2767a923
Showing 16 changed files with 211 additions and 125 deletions
app/libs/libcnlivelive.jar
app/libs/libcnliveshortvideo.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/shortvideo/activity/EditActivity.java
app/src/main/java/com/cnlive/gundam/shortvideo/activity/ShortVideoActivity.java
app/src/main/java/com/cnlive/gundam/shortvideo/activity/ShortVideoPlayActivity.java
app/src/main/java/com/cnlive/gundam/shortvideo/fragment/MyVideoFragment.java
app/src/main/java/com/cnlive/gundam/shortvideo/model/ShortVideoInfo.java
app/src/main/java/com/cnlive/gundam/shortvideo/util/FileUtils.java
app/src/main/res/drawable/edit_title_choose.xml
app/src/main/res/layout/activity_short_video_play.xml
app/src/main/res/layout/edit_bottombar.xml
app/src/main/res/layout/edit_caption.xml
app/src/main/res/layout/fragment_my_video.xml
app/src/main/res/layout/layout_item_short_video.xml
@@ -128,7 +128,10 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-        <activity android:name=".shortvideo.activity.ShortVideoPlayActivity"></activity>
+        <activity android:name=".shortvideo.activity.ShortVideoPlayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
     </application>
 </manifest>
 \ No newline at end of file
@@ -69,7 +69,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 if (uid != 0) {
                     //进入个人中心页面
                     Intent intent = new Intent(getActivity(), UserPersonalActivity.class);
-                    intent.putExtra("isEdit",false);
+                    intent.putExtra("isEdit", false);
                     startActivity(intent);
                 } else {
                     //进入登录页面
@@ -81,7 +81,13 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), CommentActivity.class));
                 break;
             case R.id.my_video:
-                startActivity(new Intent(getActivity(), MyVideoActivity.class));
+                int userId = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
+                if (userId != 0) {
+                    startActivity(new Intent(getActivity(), MyVideoActivity.class));
+
+                } else {
+                    startActivity(new Intent(getActivity(), LoginActivity.class));
+                }
                 break;
         }
@@ -99,11 +105,11 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     }
     private void notifyUI(boolean isLogin) {
-        if(isLogin){
+        if (isLogin) {
             User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
             Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
             binding.tvNickname.setText(activeAccountInfo.getNickname());
-        }else{
+        } else {
             Glide.with(getActivity()).load(R.drawable.cnlive_user_header).into(binding.headImg);
             binding.tvNickname.setText(getString(R.string.click_login));
         }
@@ -49,10 +49,12 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.ActivityEditBinding;
 import com.cnlive.gundam.shortvideo.sticker.StickerAdapter;
 import com.cnlive.gundam.shortvideo.util.ColorPicker;
+import com.cnlive.gundam.shortvideo.util.FileUtils;
 import com.cnlive.gundam.shortvideo.videorange.HorizontalListView;
 import com.cnlive.gundam.shortvideo.videorange.VideoRangeSeekBar;
 import com.cnlive.gundam.shortvideo.videorange.VideoThumbnailAdapter;
 import com.cnlive.gundam.shortvideo.videorange.VideoThumbnailInfo;
+import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.lib.upload.listener.CNPutObjectResponseListener;
 import com.cnlive.lib.upload.model.UploadError;
 import com.cnlive.libs.shortvideo.kit.CNEditKit;
@@ -844,11 +846,6 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
                     Log.e(TAG, bitmap + " : " + strings[0]);
                     binding.editBarBottom.audioChoose.originAudioReverb.setSelection(0);
                     binding.editBarBottom.audioChoose.originAudioEffect.setSelection(0);
-//                    if (mComposeAlertDialog != null) {
-//                        mComposeAlertDialog.composeFinished(strings[0]);
-//                        mComposeFinished = true;
-//                    }
-//                    mEditKit.getUploadInfo(strings[0], "test.mp4", "", mPutObjectResponseListener);
                     showVideoDialog(bitmap, strings[0]);
                 }
                 case ShortVideoConstants.SHORTVIDEO_COMPOSE_ABORTED:
@@ -869,7 +866,9 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
     private AlertDialog uploadVideoMessageDialog;
-    public void showVideoDialog(Bitmap bitmap, final String fileUrl) {
+    public void showVideoDialog(final Bitmap bitmap, final String fileUrl) {
+        final String userId = String.valueOf(UserService.getInstance(this).getActiveAccountInfo().getUid());
+        Log.e("Lynntest", userId);
         LayoutInflater layoutInflater = LayoutInflater.from(this);
         View videoMesDialog = layoutInflater.inflate(R.layout.upload_video_dialog, null);
@@ -906,7 +905,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
                         mComposeAlertDialog.composeFinished(fileUrl);
                         mComposeFinished = true;
                     }
-                    mEditKit.getUploadInfo(fileUrl, titleStr.concat(".mp4"), desStr, mPutObjectResponseListener);
+                    mEditKit.getUploadInfo(userId, fileUrl, titleStr.concat(".mp4"), desStr, new File(FileUtils.saveBitmap(EditActivity.this, bitmap)), null, mPutObjectResponseListener);
                     uploadVideoMessageDialog.dismiss();
                 } else {
                     Toast.makeText(EditActivity.this, "标题不能为空哦~", Toast.LENGTH_SHORT).show();
@@ -596,7 +596,7 @@ public class ShortVideoActivity extends AppCompatActivity {
                 break;
             case R.id.short_video_record_right_img:
                 if (binding.shortVideoRecordBottomLayout.shortVideoRecordRightImg.getDrawable().getLevel() == 3) {
-                    Toast.makeText(ShortVideoActivity.this, "上传", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(ShortVideoActivity.this, "上传", Toast.LENGTH_SHORT).show();
                     onNextClick();
                 } else if (binding.shortVideoRecordBottomLayout.shortVideoRecordRightImg.getDrawable().getLevel() == 1) {
@@ -178,6 +178,7 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
         toppanel = playBinding.topPlayerPanel;
         playBinding.videoTitle.setText(name);
         playBinding.videoDescription.setText(des);
+        mPlayerSeekbar.setOnSeekBarChangeListener(mSeekBarListener);
     }
     private MediaPlayer.OnPreparedListener mOnPreparedListener = new MediaPlayer.OnPreparedListener() {
@@ -239,7 +240,7 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
     private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
         @Override
         public void onCompletion(IMediaPlayer mp) {
-            Toast.makeText(mContext, "OnCompletionListener, play complete.", Toast.LENGTH_LONG).show();
+//            Toast.makeText(mContext, "OnCompletionListener, play complete.", Toast.LENGTH_LONG).show();
             videoPlayEnd();
         }
     };
@@ -272,10 +273,10 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
                     Log.d(TAG, "Buffering End.");
                     break;
                 case MediaPlayer.MEDIA_INFO_AUDIO_RENDERING_START:
-                    Toast.makeText(mContext, "Audio Rendering Start", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(mContext, "Audio Rendering Start", Toast.LENGTH_SHORT).show();
                     break;
                 case MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:
-                    Toast.makeText(mContext, "Video Rendering Start", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(mContext, "Video Rendering Start", Toast.LENGTH_SHORT).show();
                     break;
 //                case MediaPlayer.MEDIA_INFO_SUGGEST_RELOAD:
 //                    // Player find a new stream(video or audio), and we could reload the video.
@@ -283,7 +284,7 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
 //                        mVideoView.reload(mDataSource, false);
 //                    break;
                 case MediaPlayer.MEDIA_INFO_RELOADED:
-                    Toast.makeText(mContext, "Succeed to reload video.", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(mContext, "Succeed to reload video.", Toast.LENGTH_SHORT).show();
                     Log.d(TAG, "Succeed to reload video.");
                     return false;
             }
@@ -408,6 +409,9 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
             case R.id.player_start:
                 onPlayBtnClick();
                 break;
+            case R.id.back:
+                videoPlayEnd();
+                break;
         }
     }
@@ -57,6 +57,8 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener,
     private Handler mMainHandler;
     private int maxDuration;
+    private String userId;
+
     public MyVideoFragment() {
         // Required empty public constructor
     }
@@ -92,8 +94,11 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener,
     }
     private void loadData() {
+        userId = String.valueOf(UserService.getInstance(getActivity()).getActiveAccountInfo().getUid());
+
         Map<String, String> params = new HashMap<>();
         params.put("appId", Config.getAppId());
+        params.put("userId", userId);
         params.put("page", "1");
         params.put("pageSize", "15");
         params.put("platform_id", Config.getContext().getPackageName());
@@ -132,13 +137,8 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener,
                 getActivity().finish();
                 break;
             case R.id.record:
-                User user = UserService.getInstance(getActivity()).getActiveAccountInfo();
-                if (user.getUid() == 0) {
-                    startActivity(new Intent(getActivity(), LoginActivity.class));
-                } else {
-                    onRecordClick();
-                    onAuthClick();
-                }
+                onRecordClick();
+                onAuthClick();
                 break;
         }
     }
@@ -207,7 +207,7 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener,
                 public void run() {
                     AuthInfoManager.getInstance().removeAuthResultListener(mCheckAuthResultListener);
                     if (AuthInfoManager.getInstance().getAuthState()) {
-                        Toast.makeText(getActivity(), "Auth Success", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(getActivity(), "Auth Success", Toast.LENGTH_SHORT).show();
                     } else {
                         Toast.makeText(getActivity(), "Auth Failed", Toast.LENGTH_SHORT).show();
                     }
@@ -243,6 +243,8 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener,
             if (model != null && "0".equals(model.getCode())) {
                 if (model.getData() == null) {
                     Toast.makeText(getActivity(), "暂无数据", Toast.LENGTH_SHORT).show();
+                    binding.recyclerView.setVisibility(View.GONE);
+                    binding.emptyView.setVisibility(View.VISIBLE);
                 } else {
                     adapter.updateItems(model.getData().getList());
                 }
 package com.cnlive.gundam.shortvideo.model;
-import com.cnlive.gundam.shortvideo.util.DateUtils;
-
 import java.io.Serializable;
 /**
@@ -9,33 +7,38 @@ import java.io.Serializable;
  */
 public class ShortVideoInfo implements Serializable {
-    private String appId;
-    private String createTime;
+//    private String appId;
+//    private String createTime;
     private String description;
-    private String id;
-    private String md5;
+//    private String id;
+//    private String md5;
     private String name;
-    private String path;
-    private String spId;
+    private String picKey;
+//    private String path;
+//    private String spId;
     private String status;
-    private String updateTime;
+//    private String updateTime;
     private String videoId;
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getCreateTime() {
-        return DateUtils.getDateToString(Long.parseLong(createTime));
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
+//    public String getAppId() {
+//        return appId;
+//    }
+//
+//    public void setAppId(String appId) {
+//        this.appId = appId;
+//    }
+//
+//    public String getCreateTime() {
+//        if (createTime != null) {
+//            return DateUtils.getDateToString(Long.parseLong(createTime));
+//        }else {
+//            return "";
+//        }
+//    }
+//
+//    public void setCreateTime(String createTime) {
+//        this.createTime = createTime;
+//    }
     public String getDescription() {
         return description;
@@ -45,21 +48,21 @@ public class ShortVideoInfo implements Serializable {
         this.description = description;
     }
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getMd5() {
-        return md5;
-    }
-
-    public void setMd5(String md5) {
-        this.md5 = md5;
-    }
+//    public String getId() {
+//        return id;
+//    }
+//
+//    public void setId(String id) {
+//        this.id = id;
+//    }
+//
+//    public String getMd5() {
+//        return md5;
+//    }
+//
+//    public void setMd5(String md5) {
+//        this.md5 = md5;
+//    }
     public String getName() {
         return name;
@@ -69,21 +72,29 @@ public class ShortVideoInfo implements Serializable {
         this.name = name;
     }
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
+    public String getPicKey() {
+        return picKey;
     }
-    public String getSpId() {
-        return spId;
+    public void setPicKey(String picKey) {
+        this.picKey = picKey;
     }
-    public void setSpId(String spId) {
-        this.spId = spId;
-    }
+    //    public String getPath() {
+//        return path;
+//    }
+//
+//    public void setPath(String path) {
+//        this.path = path;
+//    }
+//
+//    public String getSpId() {
+//        return spId;
+//    }
+//
+//    public void setSpId(String spId) {
+//        this.spId = spId;
+//    }
     public String getStatus() {
         return status;
@@ -93,13 +104,13 @@ public class ShortVideoInfo implements Serializable {
         this.status = status;
     }
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
+//    public String getUpdateTime() {
+//        return updateTime;
+//    }
+//
+//    public void setUpdateTime(String updateTime) {
+//        this.updateTime = updateTime;
+//    }
     public String getVideoId() {
         return videoId;
@@ -112,16 +123,10 @@ public class ShortVideoInfo implements Serializable {
     @Override
     public String toString() {
         return "ShortVideoInfo{" +
-                "appId='" + appId + '\'' +
-                ", createTime='" + createTime + '\'' +
-                ", description='" + description + '\'' +
-                ", id='" + id + '\'' +
-                ", md5='" + md5 + '\'' +
+                "description='" + description + '\'' +
                 ", name='" + name + '\'' +
-                ", path='" + path + '\'' +
-                ", spId='" + spId + '\'' +
+                ", picKey='" + picKey + '\'' +
                 ", status='" + status + '\'' +
-                ", updateTime='" + updateTime + '\'' +
                 ", videoId='" + videoId + '\'' +
                 '}';
     }
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
+import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
@@ -15,6 +16,9 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.UUID;
 /**
  * Created by Lynn on 6/28/2017.
@@ -308,4 +312,54 @@ public class FileUtils {
         }
         return duration;
     }
+
+
+    private static final String SD_PATH = "/sdcard/cn_sv_cover_img";
+    private static final String IN_PATH = "/dskqxt/pic/";
+
+    /**
+     * 随机生产文件名
+     *
+     * @return
+     */
+    private static String generateFileName() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 保存bitmap到本地
+     *
+     * @param context
+     * @param mBitmap
+     * @return
+     */
+    public static String saveBitmap(Context context, Bitmap mBitmap) {
+        String savePath;
+        File filePic;
+        if (Environment.getExternalStorageState().equals(
+                Environment.MEDIA_MOUNTED)) {
+            savePath = SD_PATH;
+        } else {
+            savePath = context.getApplicationContext().getFilesDir()
+                    .getAbsolutePath()
+                    + IN_PATH;
+        }
+        try {
+            filePic = new File(savePath + generateFileName() + ".png");
+            if (!filePic.exists()) {
+                filePic.getParentFile().mkdirs();
+                filePic.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(filePic);
+            mBitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+
+        return filePic.getAbsolutePath();
+    }
 }
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="#ffcc00" android:state_activated="true" />
-    <item android:color="@android:color/white" />
+    <item android:color="#EEE8AA" />
 </selector>
 \ No newline at end of file
@@ -42,6 +42,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="10dp"
+                android:onClick="onClick"
                 android:src="@drawable/player_back" />
             <TextView
@@ -4,7 +4,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#616060">
+        android:background="@color/white">
         <RelativeLayout
             android:id="@+id/edit_layout"
@@ -106,7 +106,7 @@
             android:layout_width="match_parent"
             android:layout_height="2px"
             android:layout_below="@+id/edit_layout"
-            android:background="#FF000000" />
+            android:background="@color/ffcc00" />
         <FrameLayout
             android:layout_width="match_parent"
@@ -21,8 +21,8 @@
                 android:layout_weight="1"
                 android:hint="input text ..."
                 android:paddingLeft="8dp"
-                android:textColor="#ffffff"
-                android:textColorHint="#ffffff" />
+                android:textColor="#ffcc00"
+                android:textColorHint="#f0f0f0" />
             <ImageView
                 android:id="@+id/text_color"
@@ -30,7 +30,7 @@
                 android:layout_height="25dp"
                 android:layout_gravity="center_vertical"
                 android:layout_margin="10dp"
-                android:background="#ffffff"
+                android:background="#ffcc00"
                 android:onClick="onClick" />
         </LinearLayout>
@@ -21,29 +21,39 @@
         android:layout_height="match_parent">
         <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/contentView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
+            android:id="@+id/contentView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
-            <include
-                android:id="@+id/myVideoIncludLayout"
-                layout="@layout/toolbar_my_video" />
-
-            <include layout="@layout/user_divider_head_line" />
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recycler_view"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:adapter="@{listAdapter}"
-                app:layoutManager="@{layoutManager}" />
-
-        </LinearLayout>
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <include
+                    android:id="@+id/myVideoIncludLayout"
+                    layout="@layout/toolbar_my_video" />
+
+                <include layout="@layout/user_divider_head_line" />
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:adapter="@{listAdapter}"
+                    app:layoutManager="@{layoutManager}" />
+
+                <TextView
+                    android:id="@+id/empty_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="您还没有录制过视频\n\n快去录制吧⁽⁽ଘ( ˊᵕˋ )ଓ⁾⁾*"
+                    android:textSize="20sp"
+                    android:visibility="gone" />
+
+            </LinearLayout>
         </android.support.v4.widget.SwipeRefreshLayout>
     </RelativeLayout>
@@ -36,7 +36,9 @@
                 android:id="@+id/cover_image"
                 android:layout_width="90dp"
                 android:layout_height="90dp"
-                android:src="@drawable/default_pic" />
+                android:padding="2dp"
+                app:error="@{@drawable/default_pic}"
+                app:imageUrl="@{shortVideoInfo.picKey}" />
             <LinearLayout
                 android:layout_width="match_parent"
@@ -53,14 +55,14 @@
                     android:textColor="@color/black"
                     android:textSize="18sp" />
-                <TextView
-                    android:id="@+id/video_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:text="@{shortVideoInfo.createTime}"
-                    android:textSize="14sp" />
+                <!--<TextView-->
+                <!--android:id="@+id/video_time"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginLeft="10dp"-->
+                <!--android:layout_marginTop="10dp"-->
+                <!--android:text="@{shortVideoInfo.createTime}"-->
+                <!--android:textSize="14sp" />-->
                 <TextView
                     android:id="@+id/video_description"