更新短视频SDK

王琳
1 parent 62c5d875
Showing 54 changed files with 206 additions and 194 deletions
.idea/misc.xml
app/build.gradle
app/libs/libcnlivelive.jar
app/libs/libcnliveshortvideo.jar
app/libs/libcnliveupload.jar
app/libs/libcnliveutil.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/shortvideo/application/CNShrotVideoApplication.java → app/src/main/java/com/cnlive/cnUploadDemo/application/CNShrotVideoApplication.java
app/src/main/java/com/cnlive/demo/shortvideo/file/FileUtils.java → app/src/main/java/com/cnlive/cnUploadDemo/file/FileUtils.java
app/src/main/java/com/cnlive/demo/shortvideo/file/LocalStorageProvider.java → app/src/main/java/com/cnlive/cnUploadDemo/file/LocalStorageProvider.java
app/src/main/java/com/cnlive/demo/shortvideo/file/VideoInfo.java → app/src/main/java/com/cnlive/cnUploadDemo/file/VideoInfo.java
app/src/main/java/com/cnlive/demo/shortvideo/network/HttpRequest.java → app/src/main/java/com/cnlive/cnUploadDemo/network/HttpRequest.java
app/src/main/java/com/cnlive/demo/shortvideo/network/model/ShortVideoDataModel.java → app/src/main/java/com/cnlive/cnUploadDemo/network/model/ShortVideoDataModel.java
app/src/main/java/com/cnlive/demo/shortvideo/network/model/ShortVideoInfo.java → app/src/main/java/com/cnlive/cnUploadDemo/network/model/ShortVideoInfo.java
app/src/main/java/com/cnlive/demo/shortvideo/network/model/ShortVideoList.java → app/src/main/java/com/cnlive/cnUploadDemo/network/model/ShortVideoList.java
app/src/main/java/com/cnlive/demo/shortvideo/network/util/SignUtil.java → app/src/main/java/com/cnlive/cnUploadDemo/network/util/SignUtil.java
app/src/main/java/com/cnlive/demo/shortvideo/sticker/StickerAdapter.java → app/src/main/java/com/cnlive/cnUploadDemo/sticker/StickerAdapter.java
app/src/main/java/com/cnlive/demo/shortvideo/ui/activity/EditActivity.java → app/src/main/java/com/cnlive/cnUploadDemo/ui/activity/EditActivity.java
app/src/main/java/com/cnlive/demo/shortvideo/ui/activity/FileImportActivity.java → app/src/main/java/com/cnlive/cnUploadDemo/ui/activity/FileImportActivity.java
app/src/main/java/com/cnlive/demo/shortvideo/ui/activity/ListVideoActivity.java → app/src/main/java/com/cnlive/cnUploadDemo/ui/activity/ListVideoActivity.java
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -4,8 +4,8 @@ android {
     compileSdkVersion 25
     buildToolsVersion "25.0.3"
     defaultConfig {
-        applicationId "com.cnlive.demo.shortvideo"
-        minSdkVersion 15
+        applicationId "com.cnlive.cnUploadDemo"
+        minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
@@ -24,10 +24,12 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile files('libs/android-async-http-1.4.6.jar')
-    compile files('libs/libcnliveupload.jar')
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:recyclerview-v7:25.3.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
     testCompile 'junit:junit:4.12'
+    compile 'com.cnlive:lib_upload:2.0.5'
+    compile 'com.cnlive:lib_cnlive:2.2.0'
+    compile 'com.cnlive:lib_shortvideo:1.0.2'
 }
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cnlive.demo.shortvideo">
+    package="com.cnlive.cnUploadDemo">
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -20,14 +20,14 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <application
-        android:name=".application.CNShrotVideoApplication"
+        android:name="com.cnlive.cnUploadDemo.application.CNShrotVideoApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ui.activity.MainActivity">
+        <activity android:name="com.cnlive.cnUploadDemo.ui.activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -35,20 +35,20 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.activity.RecordActivity"
+            android:name="com.cnlive.cnUploadDemo.ui.activity.RecordActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.activity.EditActivity"
+            android:name="com.cnlive.cnUploadDemo.ui.activity.EditActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.activity.FileImportActivity"
+            android:name="com.cnlive.cnUploadDemo.ui.activity.FileImportActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-        <activity android:name=".ui.activity.ListVideoActivity"></activity>
-        <activity android:name=".ui.activity.ShortVideoPlayActivity"/>
+        <activity android:name="com.cnlive.cnUploadDemo.ui.activity.ListVideoActivity"></activity>
+        <activity android:name="com.cnlive.cnUploadDemo.ui.activity.ShortVideoPlayActivity"/>
     </application>
 </manifest>
 \ No newline at end of file
-package com.cnlive.demo.shortvideo.application;
+package com.cnlive.cnUploadDemo.application;
 import android.app.Application;
@@ -18,6 +18,7 @@ public class CNShrotVideoApplication extends Application {
          * param appKey   在open.cnlive.com网站申请得到的appKey
          * param isTestEnvironment   是否是测试环境 true 测试环境  false 正式环境
          */
-        Config.init(this, "60_j4rzqads62", "ae0c2fea70d08e49b6a5ebb99ad7d6e8eec07de722701b", true);
+//        Config.init(this, "60_j4rzqads62", "ae0c2fea70d08e49b6a5ebb99ad7d6e8eec07de722701b");
+        Config.init(this, "60_jaxisljz90", "1ee33b54e18a66b94eca7f8149408565b02f749d314926");
     }
 }
-package com.cnlive.demo.shortvideo.file;
+package com.cnlive.cnUploadDemo.file;
 import android.content.ContentUris;
 import android.content.Context;
-package com.cnlive.demo.shortvideo.file;
+package com.cnlive.cnUploadDemo.file;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
@@ -16,7 +16,7 @@ import android.provider.DocumentsProvider;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 import java.io.File;
 import java.io.FileNotFoundException;
-package com.cnlive.demo.shortvideo.file;
+package com.cnlive.cnUploadDemo.file;
 import android.graphics.Bitmap;
-package com.cnlive.demo.shortvideo.network;
+package com.cnlive.cnUploadDemo.network;
-import android.provider.ContactsContract;
 import android.text.TextUtils;
 import android.util.Log;
-import com.cnlive.demo.shortvideo.network.model.ShortVideoDataModel;
-import com.cnlive.demo.shortvideo.network.model.ShortVideoInfo;
-import com.cnlive.demo.shortvideo.network.util.SignUtil;
+import com.cnlive.cnUploadDemo.network.model.ShortVideoDataModel;
+import com.cnlive.cnUploadDemo.network.util.SignUtil;
 import com.cnlive.libs.shortvideo.callback.Callback;
 import com.cnlive.libs.shortvideo.kit.base.ICNEditKit;
 import com.cnlive.libs.util.Config;
@@ -71,7 +69,9 @@ public class HttpRequest {
         mShortVideoListCallback = new DataGenericsCallback<ShortVideoDataModel>(callback) {
             @Override
             public void onError(Call call, Exception e) {
-                if (callback == null) return;
+                if (callback == null) {
+                    return;
+                }
                 if (!NetUtil.checkNetwork(Config.getContext())) {
                     callback.onError(-10000, "网络连接失败");
                 } else {
@@ -85,7 +85,9 @@ public class HttpRequest {
             @Override
             public void onResponse(ShortVideoDataModel shortVideoInfo, Exception e) {
-                if (callback == null) return;
+                if (callback == null) {
+                    return;
+                }
                 if (shortVideoInfo != null && "0".equals(shortVideoInfo.getErrorCode())) {
                     callback.onInfo(ICNEditKit.INFO_GET_UPLOAD_INFO_SUCCESS, shortVideoInfo);
                 } else if (shortVideoInfo != null && !TextUtils.isEmpty(shortVideoInfo.getErrorCode())) {
-package com.cnlive.demo.shortvideo.network.model;
+package com.cnlive.cnUploadDemo.network.model;
 import com.cnlive.libs.shortvideo.network.model.ErrorMessage;
-import java.io.Serializable;
-
 /**
  * Created by Lynn on 2017/7/13.
  */
-package com.cnlive.demo.shortvideo.network.model;
+package com.cnlive.cnUploadDemo.network.model;
 import com.cnlive.libs.util.model.BaseData;
-package com.cnlive.demo.shortvideo.network.model;
+package com.cnlive.cnUploadDemo.network.model;
 import com.cnlive.libs.util.model.BaseData;
-import java.io.Serializable;
 import java.util.List;
 /**
-package com.cnlive.demo.shortvideo.network.util;
+package com.cnlive.cnUploadDemo.network.util;
 import android.content.Context;
 import android.util.Log;
@@ -28,7 +28,9 @@ public class SignUtil {
     private static final String TAG = "SignUtil";
     public static Map<String, String> getSignParamM(Context context, Map<String, String> params) {
-        if (context == null || params == null) return new HashMap<>();
+        if (context == null || params == null) {
+            return new HashMap<>();
+        }
         params.put("platform_id", context.getPackageName());
         params.put("timestamp", String.valueOf(getTime() / 1000));
         Map<String, String> map = order(params);
@@ -43,7 +45,9 @@ public class SignUtil {
     }
     private static String getSignParam(Context context, Map<String, String> params) {
-        if (context == null || params == null) return "";
+        if (context == null || params == null) {
+            return "";
+        }
         params.put("platform_id", context.getPackageName());
         params.put("timestamp", String.valueOf(getTime() / 1000));
@@ -92,6 +96,7 @@ public class SignUtil {
         List<Map.Entry<String, String>> infoIds = new ArrayList<>(map.entrySet());
         Collections.sort(infoIds, new Comparator<Map.Entry<String, String>>() {
+            @Override
             public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
                 return o1.getKey().compareTo(o2.getKey());
             }
-package com.cnlive.demo.shortvideo.sticker;
+package com.cnlive.cnUploadDemo.sticker;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
 import com.nostra13.universalimageloader.cache.disc.naming.HashCodeFileNameGenerator;
 import com.nostra13.universalimageloader.cache.memory.impl.LruMemoryCache;
-package com.cnlive.demo.shortvideo.ui.activity;
+package com.cnlive.cnUploadDemo.ui.activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -48,18 +48,19 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.file.FileUtils;
-import com.cnlive.demo.shortvideo.ui.dialog.ShortVideoConfigDialog;
-import com.cnlive.demo.shortvideo.sticker.StickerAdapter;
-import com.cnlive.demo.shortvideo.util.ColorPicker;
-import com.cnlive.demo.shortvideo.videorange.HorizontalListView;
-import com.cnlive.demo.shortvideo.videorange.VideoRangeSeekBar;
-import com.cnlive.demo.shortvideo.videorange.VideoThumbnailAdapter;
-import com.cnlive.demo.shortvideo.videorange.VideoThumbnailInfo;
-import com.cnlive.lib.upload.listener.CNPutObjectResponseListener;
-import com.cnlive.lib.upload.model.UploadError;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.file.FileUtils;
+import com.cnlive.cnUploadDemo.ui.dialog.ShortVideoConfigDialog;
+import com.cnlive.cnUploadDemo.sticker.StickerAdapter;
+import com.cnlive.cnUploadDemo.util.ColorPicker;
+import com.cnlive.cnUploadDemo.videorange.HorizontalListView;
+import com.cnlive.cnUploadDemo.videorange.VideoRangeSeekBar;
+import com.cnlive.cnUploadDemo.videorange.VideoThumbnailAdapter;
+import com.cnlive.cnUploadDemo.videorange.VideoThumbnailInfo;
+import com.cnlive.libs.shortvideo.callback.CNPutObjectResponseListener;
 import com.cnlive.libs.shortvideo.kit.CNEditKit;
+import com.cnlive.libs.shortvideo.kit.base.ICNEditKit;
+import com.cnlive.libs.shortvideo.model.UploadError;
 import com.cnlive.libs.shortvideo.utils.base.ShortVideoConstants;
 import com.cnlive.libs.shortvideo.view.CNStickerView;
 import com.cnlive.libs.shortvideo.view.CNTextView;
@@ -87,15 +88,15 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_ILLUSION;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_PRO;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SMOOTH;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT_EXT;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT_SHARPEN;
-import static com.cnlive.libs.stream.model.Filters.DENOISE;
-import static com.cnlive.libs.stream.model.Filters.SKIN_WHITEN;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_DENOISE;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_DISABLE;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_ILLUSION;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_PRO;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SKINWHITEN;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SMOOTH;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SOFT;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SOFT_EXT;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SOFT_SHARPEN;
 public class EditActivity extends AppCompatActivity implements ActivityCompat.OnRequestPermissionsResultCallback {
     private static String TAG = EditActivity.class.getSimpleName();
@@ -718,6 +719,9 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
         @Override
         public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
             Log.e(TAG, "upload failure " + uploadError.getErrorMessage());
+            if (i == ICNEditKit.ERROR_VIDEO_COMPLETE_SYNCHRODATA_INTERNET || i == ICNEditKit.ERROR_VIDEO_COMPLETE_SYNCHRODATA_OTHER || i == ICNEditKit.ERROR_VIDEO_COMPLETE_SYNCHRODATA_SERVER) {
+                Log.e(TAG, "同步数据出错, 可以调用mEditKit.synchroData(callback);方法重新同步数据");
+            }
             if (mComposeAlertDialog != null)
                 mComposeAlertDialog.uploadFinished(false, null);
         }
@@ -939,7 +943,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
                         mComposeAlertDialog.composeFinished(strings[0]);
                         mComposeFinished = true;
                     }
-                    mEditKit.getUploadInfo("1342671", strings[0], "title.mp4", "des", new File(FileUtils.saveBitmap(EditActivity.this, bitmap)), null, mPutObjectResponseListener);
+                    mEditKit.getUploadInfo("1342671", strings[0], "title.mp4", "des", new File(FileUtils.saveBitmap(EditActivity.this, bitmap)), 1, null, mPutObjectResponseListener);
                 }
                 case ShortVideoConstants.SHORTVIDEO_COMPOSE_ABORTED:
                     break;
@@ -1093,31 +1097,31 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
                 }
                 switch (position) {
                     case 0:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_DISABLE.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_DISABLE.getFilter());
                         break;
                     case 1:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_SOFT.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_SOFT.getFilter());
                         break;
                     case 2:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), SKIN_WHITEN.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_SKINWHITEN.getFilter());
                         break;
                     case 3:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_ILLUSION.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_ILLUSION.getFilter());
                         break;
                     case 4:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), DENOISE.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_DENOISE.getFilter());
                         break;
                     case 5:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_SMOOTH.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_SMOOTH.getFilter());
                         break;
                     case 6:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_SOFT_EXT.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_SOFT_EXT.getFilter());
                         break;
                     case 7:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_SOFT_SHARPEN.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_SOFT_SHARPEN.getFilter());
                         break;
                     case 8:
-                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), BEAUTY_PRO.getFilter());
+                        mEditKit.getImgTexFilterMgt().setFilter(mEditKit.getGLRender(), CN_FILTER_BEAUTY_PRO.getFilter());
                         break;
                 }
             }
-package com.cnlive.demo.shortvideo.ui.activity;
+package com.cnlive.cnUploadDemo.ui.activity;
 import android.Manifest;
 import android.content.ActivityNotFoundException;
@@ -25,8 +25,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.file.FileUtils;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.file.FileUtils;
 import com.cnlive.libs.video.video.MediaPlayer;
 import com.cnlive.libs.video.video.base.IMediaPlayer;
-package com.cnlive.demo.shortvideo.ui.activity;
+package com.cnlive.cnUploadDemo.ui.activity;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.network.HttpRequest;
-import com.cnlive.demo.shortvideo.network.model.ShortVideoDataModel;
-import com.cnlive.demo.shortvideo.ui.adapter.ShortVideoAdapter;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.network.HttpRequest;
+import com.cnlive.cnUploadDemo.network.model.ShortVideoDataModel;
+import com.cnlive.cnUploadDemo.ui.adapter.ShortVideoAdapter;
 import com.cnlive.libs.shortvideo.callback.Callback;
-import com.cnlive.libs.util.HttpUtils;
 public class ListVideoActivity extends AppCompatActivity implements SwipeRefreshLayout.OnRefreshListener {
-package com.cnlive.demo.shortvideo.ui.activity;
+package com.cnlive.cnUploadDemo.ui.activity;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -9,8 +9,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.ui.dialog.ShortVideoConfigDialog;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.ui.dialog.ShortVideoConfigDialog;
 import com.cnlive.libs.shortvideo.ShortVideoTask;
 import com.cnlive.libs.shortvideo.callback.Callback;
 import com.cnlive.libs.shortvideo.callback.CheckAuthResultListener;
@@ -76,7 +76,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     }
     private void onAuthClick() {
-        // TODO: 6/12/2017 SDK鉴权
         mAuthButton.setEnabled(false);
         ShortVideoTask.shortVideoAuth(new Callback() {
-package com.cnlive.demo.shortvideo.ui.activity;
+package com.cnlive.cnUploadDemo.ui.activity;
 import android.Manifest;
 import android.app.AlertDialog;
@@ -40,36 +40,37 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.file.FileUtils;
-import com.cnlive.demo.shortvideo.ui.view.CameraHintView;
-import com.cnlive.demo.shortvideo.ui.view.RecordProgressController;
-import com.cnlive.demo.shortvideo.util.FaceUnityUtil;
-import com.cnlive.demo.shortvideo.util.authpack;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.file.FileUtils;
+import com.cnlive.cnUploadDemo.ui.view.CameraHintView;
+import com.cnlive.cnUploadDemo.ui.view.RecordProgressController;
+import com.cnlive.cnUploadDemo.util.FaceUnityUtil;
+import com.cnlive.cnUploadDemo.util.authpack;
 import com.cnlive.libs.shortvideo.callback.MergeFilesFinishedListener;
 import com.cnlive.libs.shortvideo.kit.CNRecordKit;
 import com.cnlive.libs.stream.base.ICNAudioEffectFilter;
 import com.cnlive.libs.stream.base.ICNAudioReverbFilter;
 import com.cnlive.libs.stream.base.IStreamer;
-import com.cnlive.libs.stream.base.ImgFilterBase;
 import com.cnlive.libs.stream.filter.CNAudioEffectFilter;
 import com.cnlive.libs.stream.filter.CNAudioFilterBase;
 import com.cnlive.libs.stream.filter.CNAudioReverbFilter;
+import com.cnlive.libs.stream.filter.img.CNImgBeautyProFilter;
+import com.cnlive.libs.stream.filter.img.CNNewImgFilterBase;
 import com.cnlive.libs.stream.util.ImgFaceunityFilter;
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_ILLUSION;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_PRO;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SMOOTH;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT_EXT;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT_SHARPEN;
-import static com.cnlive.libs.stream.model.Filters.DENOISE;
-import static com.cnlive.libs.stream.model.Filters.SKIN_WHITEN;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_DENOISE;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_DISABLE;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_ILLUSION;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_PRO;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SKINWHITEN;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SMOOTH;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SOFT;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SOFT_EXT;
+import static com.cnlive.libs.stream.model.Filters.CN_FILTER_BEAUTY_SOFT_SHARPEN;
 public class RecordActivity extends AppCompatActivity implements
         ActivityCompat.OnRequestPermissionsResultCallback {
@@ -469,36 +470,36 @@ public class RecordActivity extends AppCompatActivity implements
                 }
                 switch (position) {
                     case 0:
-                        mRecordKit.setFilter(BEAUTY_DISABLE.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_DISABLE.getFilter());
                         break;
                     case 1:
-                        mRecordKit.setFilter(BEAUTY_SOFT.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_SOFT.getFilter());
                         break;
                     case 2:
-                        mRecordKit.setFilter(SKIN_WHITEN.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_SKINWHITEN.getFilter());
                         break;
                     case 3:
-                        mRecordKit.setFilter(BEAUTY_ILLUSION.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_ILLUSION.getFilter());
                         break;
                     case 4:
-                        mRecordKit.setFilter(DENOISE.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_DENOISE.getFilter());
                         break;
                     case 5:
-                        mRecordKit.setFilter(BEAUTY_SMOOTH.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_SMOOTH.getFilter());
                         break;
                     case 6:
-                        mRecordKit.setFilter(BEAUTY_SOFT_EXT.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_SOFT_EXT.getFilter());
                         break;
                     case 7:
-                        mRecordKit.setFilter(BEAUTY_SOFT_SHARPEN.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_SOFT_SHARPEN.getFilter());
                         break;
                     case 8:
-                        mRecordKit.setFilter(BEAUTY_PRO.getFilter());
+                        mRecordKit.setFilter(CN_FILTER_BEAUTY_PRO.getFilter());
                         break;
                 }
-                List<ImgFilterBase> filters = mRecordKit.getFilter();
+                List<CNNewImgFilterBase> filters = mRecordKit.getFilter();
                 if (filters != null && !filters.isEmpty()) {
-                    final com.cnlive.libs.stream.base.ImgFilterBase filter = filters.get(0);
+                    final CNNewImgFilterBase filter = filters.get(0);
                     mBeautyGrindLayout.setVisibility(filter.isGrindRatioSupported() ?
                             View.VISIBLE : View.GONE);
                     mBeautyWhitenLayout.setVisibility(filter.isWhitenRatioSupported() ?
@@ -519,7 +520,7 @@ public class RecordActivity extends AppCompatActivity implements
                                     } else if (seekBar == mWhitenSeekBar) {
                                         filter.setWhitenRatio(val);
                                     } else if (seekBar == mRuddySeekBar) {
-                                        if (filter instanceof com.cnlive.libs.stream.base.ImgBeautyProFilter) {
+                                        if (filter instanceof CNImgBeautyProFilter) {
                                             val = progress / 50.f - 1.0f;
                                         }
                                         filter.setRuddyRatio(val);
@@ -540,7 +541,7 @@ public class RecordActivity extends AppCompatActivity implements
                     mGrindSeekBar.setProgress((int) (filter.getGrindRatio() * 100));
                     mWhitenSeekBar.setProgress((int) (filter.getWhitenRatio() * 100));
                     int ruddyVal = (int) (filter.getRuddyRatio() * 100);
-                    if (filter instanceof com.cnlive.libs.stream.base.ImgBeautyProFilter) {
+                    if (filter instanceof CNImgBeautyProFilter) {
                         ruddyVal = (int) (filter.getRuddyRatio() * 50 + 50);
                     }
                     mRuddySeekBar.setProgress(ruddyVal);
@@ -963,7 +964,7 @@ public class RecordActivity extends AppCompatActivity implements
     private void clearRecordState() {
         mBeautySpinner.setSelection(0);
         mStickerSpinner.setSelection(0);
-        mRecordKit.setFilter(BEAUTY_DISABLE.getFilter());
+        mRecordKit.setFilter(CN_FILTER_BEAUTY_DISABLE.getFilter());
         onStickerChecked(false);
         onBgmItemClick(-1);
         onSoundEffectItemClick(-1);
-package com.cnlive.demo.shortvideo.ui.activity;
+package com.cnlive.cnUploadDemo.ui.activity;
 import android.content.Context;
 import android.content.Intent;
@@ -15,7 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 import com.cnlive.libs.util.Config;
 import com.cnlive.libs.video.video.MediaPlayer;
 import com.cnlive.libs.video.video.VideoView;
@@ -222,8 +222,9 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
                     mVideoWidth = mp.getVideoWidth();
                     mVideoHeight = mp.getVideoHeight();
-                    if (mVideoView != null)
+                    if (mVideoView != null) {
                         mVideoView.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+                    }
                 }
             }
         }
@@ -334,8 +335,9 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
     public int setVideoProgress(int currentProgress) {
-        if (mVideoView == null)
+        if (mVideoView == null) {
             return -1;
+        }
         long time = currentProgress > 0 ? currentProgress : mVideoView.getCurrentPosition();
         long length = mVideoView.getDuration();
@@ -352,8 +354,9 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
         Message msg = new Message();
         msg.what = UPDATE_SEEKBAR;
-        if (mHandler != null)
+        if (mHandler != null) {
             mHandler.sendMessageDelayed(msg, 1000);
+        }
         return (int) time;
     }
@@ -372,17 +375,19 @@ public class ShortVideoPlayActivity extends AppCompatActivity {
         DecimalFormat format = (DecimalFormat) NumberFormat.getInstance(Locale.US);
         format.applyPattern("00");
         if (text) {
-            if (millis > 0)
+            if (millis > 0) {
                 time = (negative ? "-" : "") + hours + "h" + format.format(min) + "min";
-            else if (min > 0)
+            } else if (min > 0) {
                 time = (negative ? "-" : "") + min + "min";
-            else
+            } else {
                 time = (negative ? "-" : "") + sec + "s";
+            }
         } else {
-            if (millis > 0)
+            if (millis > 0) {
                 time = (negative ? "-" : "") + hours + ":" + format.format(min) + ":" + format.format(sec);
-            else
+            } else {
                 time = (negative ? "-" : "") + min + ":" + format.format(sec);
+            }
         }
         return time;
     }
-package com.cnlive.demo.shortvideo.ui.adapter;
+package com.cnlive.cnUploadDemo.ui.adapter;
 import android.graphics.Bitmap;
 import android.util.LruCache;
-import com.android.volley.toolbox.ImageLoader;
+import com.cnlive.libs.volley.toolbox.ImageLoader;
 /**
  * Created by Lynn on 2017/7/19.
-package com.cnlive.demo.shortvideo.ui.adapter;
+package com.cnlive.cnUploadDemo.ui.adapter;
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,11 +8,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.android.volley.RequestQueue;
-import com.android.volley.toolbox.ImageLoader;
-import com.android.volley.toolbox.Volley;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.network.model.ShortVideoInfo;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.network.model.ShortVideoInfo;
+import com.cnlive.libs.volley.RequestQueue;
+import com.cnlive.libs.volley.toolbox.ImageLoader;
+import com.cnlive.libs.volley.toolbox.Volley;
 import java.util.List;
-package com.cnlive.demo.shortvideo.ui.dialog;
+package com.cnlive.cnUploadDemo.ui.dialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -14,7 +14,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 import com.cnlive.libs.stream.base.IStreamer;
 /**
-package com.cnlive.demo.shortvideo.ui.model;
+package com.cnlive.cnUploadDemo.ui.model;
 /**
  * Created by Lynn on 6/12/2017.
-package com.cnlive.demo.shortvideo.ui.util;
+package com.cnlive.cnUploadDemo.ui.util;
-import com.cnlive.demo.shortvideo.ui.view.RecordProgressController;
+import com.cnlive.cnUploadDemo.ui.view.RecordProgressController;
 /**
  * Created by Lynn on 6/12/2017.
-package com.cnlive.demo.shortvideo.ui.view;
+package com.cnlive.cnUploadDemo.ui.view;
 import android.content.Context;
 import android.graphics.Canvas;
-package com.cnlive.demo.shortvideo.ui.view;
+package com.cnlive.cnUploadDemo.ui.view;
 import android.os.Handler;
 import android.view.View;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.ui.activity.RecordActivity;
-import com.cnlive.demo.shortvideo.ui.model.RecordClipModel;
-import com.cnlive.demo.shortvideo.ui.util.RecordProgressTimer;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.ui.activity.RecordActivity;
+import com.cnlive.cnUploadDemo.ui.model.RecordClipModel;
+import com.cnlive.cnUploadDemo.ui.util.RecordProgressTimer;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -30,8 +30,7 @@ public class RecordProgressController {
     private RecordingLengthChangedListener mRecordingLengthChangedListener;
     /**
-     *
-     * @param rootView  拍摄进度显示的父控件
+     * @param rootView 拍摄进度显示的父控件
      */
     public RecordProgressController(View rootView) {
         mHandler = new Handler();
@@ -103,7 +102,9 @@ public class RecordProgressController {
      * startRecord
      */
     public void startRecording() {
-        if (mIsRecording) return;
+        if (mIsRecording) {
+            return;
+        }
         mStartRecordingTime = System.currentTimeMillis();
         mIsRecording = true;
         RecordClipModel clip = new RecordClipModel();
@@ -200,6 +201,7 @@ public class RecordProgressController {
     /**
      * 用于通知最短拍摄时长和最长拍摄时长
+     *
      * @param listener
      */
     public void setRecordingLengthChangedListener(RecordingLengthChangedListener listener) {
-package com.cnlive.demo.shortvideo.ui.view;
+package com.cnlive.cnUploadDemo.ui.view;
 import android.content.Context;
 import android.content.res.Resources;
@@ -11,9 +11,9 @@ import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.View;
-import com.cnlive.demo.shortvideo.R;
-import com.cnlive.demo.shortvideo.ui.activity.RecordActivity;
-import com.cnlive.demo.shortvideo.ui.model.RecordClipModel;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.ui.activity.RecordActivity;
+import com.cnlive.cnUploadDemo.ui.model.RecordClipModel;
 import java.util.LinkedList;
-package com.cnlive.demo.shortvideo.util;
+package com.cnlive.cnUploadDemo.util;
 import android.content.Context;
 import android.content.res.Configuration;
-package com.cnlive.demo.shortvideo.util;
+package com.cnlive.cnUploadDemo.util;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
@@ -412,6 +412,7 @@ public class ColorPicker extends Dialog {
          * @see com.sinaapp.msdxblog.androidkit.graphics.ColorPickerDialog.
          * ColorPickerView#interpRectColor(int[], float, float)
          */
+        @Override
         protected int interpRectColor(int colors[], float x, float y) {
             int a, r, g, b, c0, c1;
             float p;
@@ -559,6 +560,7 @@ public class ColorPicker extends Dialog {
          * @see com.sinaapp.msdxblog.androidkit.graphics.ColorPickerDialog.
          * ColorPickerView#interpRectColor(int[], float, float)
          */
+        @Override
         protected int interpRectColor(int colors[], float x, float y) {
             int a, r, g, b, c0, c1;
             float p;
-package com.cnlive.demo.shortvideo.util;
+package com.cnlive.cnUploadDemo.util;
 /**
  * Created by Lynn on 6/12/2017.
-package com.cnlive.demo.shortvideo.util;
+package com.cnlive.cnUploadDemo.util;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -53,8 +53,9 @@ public class RoundImageView extends ImageView {
             return;
         }
         this.measure(0, 0);
-        if (drawable.getClass() == NinePatchDrawable.class)
+        if (drawable.getClass() == NinePatchDrawable.class) {
             return;
+        }
         Bitmap b = ((BitmapDrawable) drawable).getBitmap();
         Bitmap bitmap = b.copy(Bitmap.Config.ARGB_8888, true);
         if (defaultWidth == 0) {
-package com.cnlive.demo.shortvideo.util;
+package com.cnlive.cnUploadDemo.util;
 import java.security.MessageDigest;
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -25,7 +25,7 @@ import android.widget.ListView;
 import android.widget.ScrollView;
 import android.widget.Scroller;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -1312,7 +1312,9 @@ public class HorizontalListView extends AdapterView&lt;ListAdapter&gt; {
      * @param scrolledOffset The scroll offset
      */
     private void updateOverscrollAnimation(final int scrolledOffset) {
-        if (mEdgeGlowLeft == null || mEdgeGlowRight == null) return;
+        if (mEdgeGlowLeft == null || mEdgeGlowRight == null) {
+            return;
+        }
         // Calculate where the next scroll position would be
         int nextScrollPosition = mCurrentX + scrolledOffset;
@@ -1354,7 +1356,9 @@ public class HorizontalListView extends AdapterView&lt;ListAdapter&gt; {
      * The glow is not enabled unless there are more views than can fit on the screen at one time.
      */
     private boolean isEdgeGlowEnabled() {
-        if (mAdapter == null || mAdapter.isEmpty()) return false;
+        if (mAdapter == null || mAdapter.isEmpty()) {
+            return false;
+        }
         // If the maxx is more then zero then the user can scroll, so the edge effects should be shown
         return mMaxX > 0;
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.content.Context;
 import android.content.res.Resources;
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.content.Context;
 import android.content.res.Resources;
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.content.Context;
 import android.content.res.Resources;
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,7 +9,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 /**
  * Created by Lynn on 6/13/2017.
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.content.Context;
@@ -8,12 +8,14 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
-import com.cnlive.demo.shortvideo.R;
+import com.cnlive.cnUploadDemo.R;
 import com.cnlive.libs.shortvideo.kit.CNEditKit;
 /**
  * 加载缩略图的Adapter
- * Created by Lynn on 6/13/2017.
+ *
+ * @author Lynn
+ * @date 6/13/2017
  */
 public class VideoThumbnailAdapter extends ArrayAdapter<VideoThumbnailInfo> {
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.graphics.Bitmap;
-package com.cnlive.demo.shortvideo.videorange;
+package com.cnlive.cnUploadDemo.videorange;
 import android.app.Activity;
 import android.content.Context;
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.cnlive.demo.shortvideo.ui.activity.MainActivity">
+    tools:context="com.cnlive.cnUploadDemo.ui.activity.MainActivity">
     <Button
         android:id="@+id/auth"
@@ -16,7 +16,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentTop="true" />
-        <com.cnlive.demo.shortvideo.ui.view.CameraHintView
+        <com.cnlive.cnUploadDemo.ui.view.CameraHintView
             android:id="@+id/camera_hint"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -29,7 +29,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_studio"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -51,7 +51,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_woodWing"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -73,7 +73,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_concert"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -95,7 +95,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_ktv"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -29,7 +29,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_uncle"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -51,7 +51,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_lolita"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -73,7 +73,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_solemn"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -95,7 +95,7 @@
                 android:layout_marginRight="20dp"
                 android:orientation="vertical">
-                <com.cnlive.demo.shortvideo.util.RoundImageView
+                <com.cnlive.cnUploadDemo.util.RoundImageView
                     android:id="@+id/effect_iv_robot"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
@@ -54,7 +54,7 @@
             android:layout_centerVertical="true"
             android:background="@color/record_progress_pause">
-            <com.cnlive.demo.shortvideo.ui.view.RecordProgressView
+            <com.cnlive.cnUploadDemo.ui.view.RecordProgressView
                 android:id="@+id/record_progress"
                 android:layout_width="match_parent"
                 android:layout_height="16dp"/>
@@ -66,13 +66,13 @@
             android:layout_height="114dp"
             android:layout_alignParentBottom="true">
-            <com.cnlive.demo.shortvideo.videorange.HorizontalListView
+            <com.cnlive.cnUploadDemo.videorange.HorizontalListView
                 android:id="@+id/hlistview"
                 android:layout_width="match_parent"
                 android:layout_height="59dp"
                 android:requiresFadingEdge="horizontal" />
-            <com.cnlive.demo.shortvideo.videorange.VideoRangeSeekBar xmlns:custom="http://schemas.android.com/apk/res-auto"
+            <com.cnlive.cnUploadDemo.videorange.VideoRangeSeekBar xmlns:custom="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="110dp"