修复拍照权限问题；

将media与host中的资源隔离开来，方便开发

app/src/main/java/cn/finalteam/rxgalleryfinal/utils/CameraUtil.java

@@ -56,6 +56,9 @@ public class CameraUtil {
 
     public static void onActivityResult(Activity activity, int requestCode, String path, CameraCallBack cameraCallBack) {
         Log.i(MediaUtils.class.getSimpleName(), "onActivityResult: requestCode=" + requestCode);
+        if(path != null){
+            activity.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + path)));
+        }
         switch (requestCode) {
             case TAKE_IMAGE_REQUEST_CODE:
                 if (path == null) {
@@ -81,7 +84,7 @@ public class CameraUtil {
     }
 
     public static final String IMAGE_STORE_FILE_NAME = "IMG_%s.jpg";
-    public static final String VIDEO_STORE_FILE_NAME = "IMG_%s.mp4";
+    public static final String VIDEO_STORE_FILE_NAME = "VIDEO_%s.mp4";
     public static final int TAKE_IMAGE_REQUEST_CODE = 1001;
     public static final int TAKE_VIDEO_REQUEST_CODE = 1002;
 }

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AccountDao.class);
-        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AccountDao accountDao;
-    private final SearchRecordDao searchRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
+    private final SearchRecordDao searchRecordDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(Account.class, accountDao);
-        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
 }

app/src/main/java/com/sheep/gamegroup/module/find/activity/ActMediaChoose.java

@@ -11,6 +11,7 @@ import android.view.View;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.cfyl.share_library.util.CallBackAPI;
 import com.kfzs.cfyl.share_library.util.Constant;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.absBase.IRefresh;
 import com.sheep.gamegroup.model.entity.DiscoveryTopic;
@@ -69,7 +70,7 @@ public class ActMediaChoose extends BaseActivity {
             public void onClick(View view) {
 //                Jump2View.getInstance().goActEditVideo(video);
                 boolean isVideo = mAdapter.getItem(viewPager.getCurrentItem()) instanceof FgtMediaPickerVideo;
-                CameraUtil.openCamera(ActMediaChoose.this, !isVideo);
+                filePath = CameraUtil.openCamera(ActMediaChoose.this, !isVideo);
             }
         });
 
@@ -101,6 +102,7 @@ public class ActMediaChoose extends BaseActivity {
 //        }
     }
 
+    private String filePath;
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
@@ -127,29 +129,39 @@ public class ActMediaChoose extends BaseActivity {
                         return;
                 }
             }
-            CameraUtil.onActivityResult(this, requestCode, null, new CameraCallBack() {
+            CameraUtil.onActivityResult(this, requestCode, filePath, new CameraCallBack() {
                 @Override
                 public void onGetImageSuccess(String cropFilePath) {
                     if (mAdapter.getItem(1) instanceof IRefresh) {
-                        ((IRefresh) mAdapter.getItem(1)).refreshData();
+                        refreshData(1);
                     }
                 }
 
                 @Override
                 public void onGetVideoSuccess() {
                     if (mAdapter.getItem(0) instanceof IRefresh) {
-                        ((IRefresh) mAdapter.getItem(0)).refreshData();
+                        refreshData(0);
                     }
                 }
 
                 @Override
                 public void onCropImageSuccess() {
                     if (mAdapter.getItem(1) instanceof IRefresh) {
-                        ((IRefresh) mAdapter.getItem(1)).refreshData();
+                        refreshData(1);
                     }
                 }
             });
         }
     }
 
+    private void refreshData(int position) {
+        ViewUtil.delay(new AbsObserver<Integer>(){
+            @Override
+            public void onNext(Integer integer) {
+                if(!ActMediaChoose.this.isDestroyed())
+                    ((IRefresh) mAdapter.getItem(position)).refreshData();
+            }
+        }, 1);
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -87,6 +87,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
             Manifest.permission.READ_EXTERNAL_STORAGE,
             Manifest.permission.ACCESS_COARSE_LOCATION,
             Manifest.permission.ACCESS_FINE_LOCATION,
+            Manifest.permission.CAMERA,
             Manifest.permission.READ_PHONE_STATE
     };
     private RxjavaCountDownTimer timer;

app/src/main/java/com/sheep/gamegroup/view/customview/VideoFramesView.java

@@ -1,279 +0,0 @@
-//package com.sheep.gamegroup.view.customview;
-//
-//import android.annotation.SuppressLint;
-//import android.content.Context;
-//import android.graphics.Bitmap;
-//import android.support.v7.widget.RecyclerView;
-//import android.util.AttributeSet;
-//import android.view.LayoutInflater;
-//import android.view.MotionEvent;
-//import android.view.View;
-//import android.widget.RelativeLayout;
-//
-//import com.chad.library.adapter.base.BaseQuickAdapter;
-//import com.chad.library.adapter.base.BaseViewHolder;
-//import com.sheep.gamegroup.model.entity.Video;
-//import com.sheep.gamegroup.util.LogUtil;
-//import com.sheep.gamegroup.util.MediaMetadataRetrieverUtil;
-//import com.sheep.jiuyan.samllsheep.R;
-//
-//import java.io.File;
-//import java.util.ArrayList;
-//import java.util.Locale;
-//
-//import rx.functions.Action1;
-//
-//
-///**
-// * Created by realicing on 2018/11/29.
-// * realicing@sina.com
-// * 显示本地视频文件对应的视频帧
-// */
-//public class VideoFramesView extends RelativeLayout {
-//    public VideoFramesView(Context context) {
-//        super(context);
-//        initView();
-//    }
-//
-//    public VideoFramesView(Context context, AttributeSet attrs) {
-//        super(context, attrs);
-//        initView();
-//    }
-//
-//    public VideoFramesView(Context context, AttributeSet attrs, int defStyleAttr) {
-//        super(context, attrs, defStyleAttr);
-//        initView();
-//    }
-//
-//    private RecyclerView recyclerView;
-//    private View line_start;
-//    private View line_end;
-//
-//    private void initView() {
-//        LayoutInflater.from(getContext()).inflate(R.layout.custom_video_frames_view, this, true);
-//        recyclerView = findViewById(R.id.recyclerView);
-//        line_start = findViewById(R.id.line_start);
-//        line_end = findViewById(R.id.line_end);
-//        line_start.setOnTouchListener(new OnTouchListener() {
-//            private float lastEventX;
-//
-//            @SuppressLint("ClickableViewAccessibility")
-//            @Override
-//            public boolean onTouch(View view, MotionEvent event) {
-//                float maxX = line_end.getX();
-//                float minX = maxX - (firstEndX - firstStartX);//结束位置 - 可以设置的长度
-//                switch (event.getAction()) {
-//                    case MotionEvent.ACTION_DOWN:
-//                        lastEventX = event.getX();
-//                        break;
-//                    case MotionEvent.ACTION_MOVE:
-//                        float mx = Math.max(firstStartX, view.getX() + event.getX() - lastEventX);
-//                        if (mx > maxX)
-//                            mx = maxX;
-//                        if (mx < minX) {
-//                            maxX += mx - minX;
-//                            line_end.setX(maxX);
-//                            view.setX(mx);
-//                        } else {
-//                            view.setX(mx);
-//                        }
-//                        if (onTimeChangeListener != null) {
-//                            onTimeChangeListener.call((maxX - mx) * video.getDuration() / (rvW - lineW));
-//                        }
-//                        break;
-//                    case MotionEvent.ACTION_UP:
-//                        break;
-//                    case MotionEvent.ACTION_CANCEL:
-//                        break;
-//                }
-//                view.invalidate();
-//                return true;
-//            }
-//        });
-//        line_end.setOnTouchListener(new OnTouchListener() {
-//            private float lastEventX;
-//
-//            @SuppressLint("ClickableViewAccessibility")
-//            @Override
-//            public boolean onTouch(View view, MotionEvent event) {
-//                float minX = line_start.getX();
-//                float maxX = firstEndX - firstStartX + minX;
-//                float endX = firstStartX + rvW - lineW;
-//                switch (event.getAction()) {
-//                    case MotionEvent.ACTION_DOWN:
-//                        lastEventX = event.getX();
-//                        break;
-//                    case MotionEvent.ACTION_MOVE:
-//                        float mx = Math.min(view.getX() + event.getX() - lastEventX, endX);
-//                        if (mx < minX)
-//                            mx = minX;
-//                        if (mx > maxX) {
-//                            minX += mx - maxX;
-//                            line_start.setX(minX);
-//                            view.setX(mx);
-//                        } else {
-//                            view.setX(mx);
-//                        }
-//                        if (onTimeChangeListener != null) {
-//                            onTimeChangeListener.call((mx - minX) * video.getDuration() / (rvW - lineW));
-//                        }
-//                        break;
-//                    case MotionEvent.ACTION_UP:
-//                        break;
-//                    case MotionEvent.ACTION_CANCEL:
-//                        break;
-//                }
-//                view.invalidate();
-//                return true;
-//            }
-//        });
-//    }
-//
-//    //开头线的进度
-//    public float getStartPercent() {
-//        if (line_start != null && recyclerView != null) {
-//            return (line_start.getX() - firstStartX) / (rvW - lineW);
-//        }
-//        return 0;
-//    }
-//
-//    private float firstStartX;//初始时开头的x位置
-//    private float firstEndX;//初始时结尾的x位置
-//    private int lineW;//开头与结尾线的宽度
-//    private int rvW;//图片列表的长度，减去lineW后==总进度的长度
-//
-//    //结尾线的进度
-//    public float getEndPercent() {
-//        if (line_end != null && recyclerView != null) {
-//            return 1.0f - ((firstStartX + rvW - lineW - line_end.getX()) / (rvW - lineW));
-//        }
-//        return 0;
-//    }
-//
-//    //总的进度
-//    public float getPercent() {
-//        if (line_end != null && recyclerView != null) {
-//            return (line_end.getX() - line_start.getX()) / (rvW - lineW);
-//        }
-//        return 0;
-//    }
-//
-//    public String getLineInfo() {
-//        return String.format(Locale.CHINA, "firstStartX = %f, firstEndX = %f, startX = %f, endX = %f, lineW = %d, rvW = %d, startPercent = %f, endPercent = %f, percent = %f", firstStartX, firstEndX, line_start.getX(), line_end.getX(), line_end.getWidth(), recyclerView.getWidth(), getStartPercent(), getEndPercent(), getPercent());
-//    }
-//
-//    private MediaMetadataRetrieverUtil mediaMetadataRetrieverUtil;
-//
-//    public MediaMetadataRetrieverUtil getMediaMetadataRetrieverUtil() {
-//        return mediaMetadataRetrieverUtil;
-//    }
-//
-//    private Video video;
-//    /**
-//     * 显示视频帧图片列表
-//     *
-//     * @param data 视频数据，包括地址与时长，宽高等
-//     * @return
-//     */
-//    public VideoFramesView initVideo(Video data) {
-//        if (data == null || data.getFilePath() == null) {
-//            LogUtil.println(VideoFramesView.class.getSimpleName(), "showList", "error", "videoPath is null");
-//            return this;
-//        }
-//        File videoFile = new File(data.getFilePath());
-//        if (!videoFile.exists()) {
-//            LogUtil.println(VideoFramesView.class.getSimpleName(), "showList", "error", "videoFile not exists");
-//            return this;
-//        }
-//        if (!videoFile.canRead()) {
-//            LogUtil.println(VideoFramesView.class.getSimpleName(), "showList", "error", "videoFile cant read");
-//            return this;
-//        }
-//        if (data.getDuration() < 1) {
-//            LogUtil.println(VideoFramesView.class.getSimpleName(), "showList", "error", "duration < 1");
-//            return this;
-//        }
-//        if (mediaMetadataRetrieverUtil == null) {
-//            mediaMetadataRetrieverUtil = new MediaMetadataRetrieverUtil(data.getFilePath(), data.getDuration());
-//        }
-//        this.video = data;
-//        return this;
-//    }
-//
-//    /**
-//     * 显示视频帧图片列表
-//     */
-//    public VideoFramesView showVideoList() {
-//        if (mediaMetadataRetrieverUtil != null) {
-//            if(videoPathList != null)
-//                mediaMetadataRetrieverUtil.initRv(recyclerView, videoPathList);
-//            else
-//                mediaMetadataRetrieverUtil.initRv2(recyclerView);
-//        }
-//        return this;
-//    }
-//
-//    private Action1<Float> onTimeChangeListener;
-//
-//    public void setOnTimeChangeListener(Action1<Float> action1) {
-//        onTimeChangeListener = action1;
-//        postDelayed(new Runnable() {
-//            @Override
-//            public void run() {
-//                firstStartX = line_start.getX();
-//                firstEndX = line_end.getX();
-//                lineW = line_start.getWidth();
-//                rvW = recyclerView.getWidth();
-//                long duration = mediaMetadataRetrieverUtil.getDuration();
-//                if(maxVideoDuration > 0) {
-//                    if(duration > maxVideoDuration) {
-//                        firstEndX = firstStartX + ((maxVideoDuration * 1.0f / duration) * (rvW - lineW));
-//                        line_end.setX(firstEndX);
-//                    }
-//                }
-//                onTimeChangeListener.call((float) duration);
-//            }
-//        }, 100);
-//    }
-//
-//    //开始的时间,单位秒
-//    public long getStartPoint() {
-//        return (long) (getStartPercent() * mediaMetadataRetrieverUtil.getDuration());
-//    }
-//
-//    //总共的时长,单位秒
-//    public long getLineDuration() {
-//        return (long) (getPercent() * mediaMetadataRetrieverUtil.getDuration());
-//    }
-//    //结束的时间,单位秒
-//    public long getEndPoint() {
-//        return (long) (getEndPercent() * mediaMetadataRetrieverUtil.getDuration());
-//    }
-//
-//    //最大剪切视频时长
-//    private long maxVideoDuration;
-//    public VideoFramesView setMaxDuration(long maxVideoDuration) {
-//        this.maxVideoDuration = maxVideoDuration;
-//        return this;
-//    }
-//    public void onDestroy(){
-//        if(recyclerView != null && recyclerView.getAdapter() instanceof BaseQuickAdapter){
-//            for (int i = 0; i < recyclerView.getAdapter().getItemCount(); i++) {
-//                Object object = ((BaseQuickAdapter) recyclerView.getAdapter()).getItem(i);
-//                if(object instanceof Bitmap){
-//                    try {
-//                        ((Bitmap) object).recycle();
-//                    } catch (Exception e){
-//                        e.printStackTrace();
-//                    }
-//                }
-//            }
-//        }
-//    }
-//
-//    private ArrayList<String> videoPathList;
-//    public VideoFramesView setVideoPathList(ArrayList<String> videoPathList) {
-//        this.videoPathList = videoPathList;
-//        return this;
-//    }
-//}

app/src/main/res/layout/act_publish_article.xml

@@ -9,7 +9,6 @@
         android:id="@+id/act_publish_article_et"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="?attr/actionBarSize"
         android:gravity="top|start"
         android:hint="@string/please_say_something"
         android:maxLength="200"

media/app/src/main/AndroidManifest.xml

@@ -91,7 +91,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/media_AppTheme">
 
         <activity android:name=".activity.MainActivity">
 

media/app/src/main/java/com/kfzs/cfyl/media/BaseActivity.java

@@ -47,7 +47,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setCustomView(R.layout.title);
+            actionBar.setCustomView(R.layout.media_title);
             actionBar.hide();
             actionBar.setDisplayShowCustomEnabled(true);
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);

media/app/src/main/java/com/kfzs/cfyl/media/BaseContainerActivity.java

@@ -11,7 +11,7 @@ public abstract class BaseContainerActivity extends BaseActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.common_container;
+        return R.layout.media_common_container;
     }
 
     protected Fragment fragment;
@@ -23,10 +23,10 @@ public abstract class BaseContainerActivity extends BaseActivity {
         fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if (fragment == null) {
             fragment = initFragment();
-            transaction.add(R.id.frame_container, fragment, "tag");
+            transaction.add(R.id.media_frame_container, fragment, "tag");
             transaction.commitAllowingStateLoss();
         } else {
-            transaction.replace(R.id.frame_container, fragment);
+            transaction.replace(R.id.media_frame_container, fragment);
             transaction.commitAllowingStateLoss();
         }
 

media/app/src/main/java/com/kfzs/cfyl/media/activity/ActCutVideo.java

@@ -47,7 +47,7 @@ public class ActCutVideo extends BaseContainerActivity implements MediaPlayer.On
 
     @Override
     protected int getLayoutId() {
-        return R.layout.act_cut_video;
+        return R.layout.media_act_cut_video;
     }
 
 
@@ -72,13 +72,13 @@ public class ActCutVideo extends BaseContainerActivity implements MediaPlayer.On
         data = JSONObject.parseObject(intent.getStringExtra(String.class.getSimpleName()), Video.class);
         Uri uri = Uri.parse(data.getFilePath());
 
-        videoView = findViewById(R.id.videoView);
-        video_loading = findViewById(R.id.video_loading);
-        videoFramesView = findViewById(R.id.videoFramesView);
-        edit_video_time_tv = findViewById(R.id.edit_video_time_tv);
-        edit_video_topic_tv = findViewById(R.id.edit_video_topic_tv);
-        edit_video_sure_tv = findViewById(R.id.edit_video_sure_tv);
-        frame_container = findViewById(R.id.frame_container);
+        videoView = findViewById(R.id.media_videoView);
+        video_loading = findViewById(R.id.media_video_loading);
+        videoFramesView = findViewById(R.id.media_videoFramesView);
+        edit_video_time_tv = findViewById(R.id.media_edit_video_time_tv);
+        edit_video_topic_tv = findViewById(R.id.media_edit_video_topic_tv);
+        edit_video_sure_tv = findViewById(R.id.media_edit_video_sure_tv);
+        frame_container = findViewById(R.id.media_frame_container);
 
         videoView.setOnInfoListener(this);
         videoView.setOnPreparedListener(this);
@@ -93,7 +93,7 @@ public class ActCutVideo extends BaseContainerActivity implements MediaPlayer.On
                     return;
                 if (videoFramesView.getVisibility() == View.VISIBLE)
                     checkDuration(duration.longValue());
-                edit_video_time_tv.setText(getString(R.string.has_choose_x_second, new DecimalFormat("#.#").format(duration / 1000.0f)));
+                edit_video_time_tv.setText(getString(R.string.media_has_choose_x_second, new DecimalFormat("#.#").format(duration / 1000.0f)));
                 edit_video_time_tv.append("\t");
                 edit_video_time_tv.append(String.valueOf(duration));
                 edit_video_time_tv.append("\t");

media/app/src/main/java/com/kfzs/cfyl/media/activity/ActEditVideo.java

@@ -42,7 +42,7 @@ public class ActEditVideo extends BaseContainerActivity implements Filterble, Le
 
     @Override
     protected int getLayoutId() {
-        return R.layout.act_edit_video;
+        return R.layout.media_act_edit_video;
     }
 
     VideoPlayerGLSurfaceView mPlayerView;
@@ -145,7 +145,7 @@ public class ActEditVideo extends BaseContainerActivity implements Filterble, Le
     private String tryGenerateVideoWithFilter() {
         String srcFilPath = data.getFilePath();
         String outputFilename = String.format(Locale.CHINA, "%s_%d_%f.mp4", srcFilPath.substring(0, srcFilPath.lastIndexOf(".")), mCurrentConfig.hashCode(), mIntensity);
-        Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.drawable.sheep_logo_3);
+        Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.drawable.media_sheep_logo_3);
         //left 30px top 60px width 750
         Bitmap logo = BitmapUtil.createBigLogo(bmp, new Size().setWidth(data.getWidth()).setHeight(data.getHeight()).setX(data.getWidth() * 30 / 750).setY(data.getWidth() * 60 / 750));
         bmp.recycle();

media/app/src/main/java/com/kfzs/cfyl/media/customview/VideoFramesView.java

@@ -60,8 +60,8 @@ public class VideoFramesView extends RelativeLayout {
     private View line_end;
 
     private void initView() {
-        LayoutInflater.from(getContext()).inflate(R.layout.custom_video_frames_view, this, true);
-        recyclerView = findViewById(R.id.recyclerView);
+        LayoutInflater.from(getContext()).inflate(R.layout.media_custom_video_frames_view, this, true);
+        recyclerView = findViewById(R.id.media_recyclerView);
         line_start = findViewById(R.id.line_start);
         line_end = findViewById(R.id.line_end);
         recyclerView.setOnTouchListener(new OnTouchListener() {
@@ -328,10 +328,10 @@ public class VideoFramesView extends RelativeLayout {
             videoFrameList.add(new VideoFrame().setVideoPath(path).setAtTime(i * per).setWidth(width).setHeight(height));
         }
         recyclerView.setLayoutManager(new GridLayoutManager(activity.getApplicationContext(), size));
-        BaseQuickAdapter<VideoFrame, BaseViewHolder> baseQuickAdapter = new BaseQuickAdapter<VideoFrame, BaseViewHolder>(R.layout.item_iv_mh, videoFrameList) {
+        BaseQuickAdapter<VideoFrame, BaseViewHolder> baseQuickAdapter = new BaseQuickAdapter<VideoFrame, BaseViewHolder>(R.layout.media_item_iv_mh, videoFrameList) {
             @Override
             protected void convert(BaseViewHolder helper, VideoFrame item) {
-                ImageView imageView = helper.getView(R.id.item_iv);
+                ImageView imageView = helper.getView(R.id.media_item_iv);
                 Glide.with(activity.getApplicationContext()).load(item.getVideoPath())
                         .apply(RequestOptions.frameOf(item.getAtTime()).set(VideoBitmapDecoder.FRAME_OPTION, MediaMetadataRetriever.OPTION_CLOSEST).transform(new VideoFrameTransform(item, false)))
                         .into(imageView);
@@ -369,11 +369,11 @@ public class VideoFramesView extends RelativeLayout {
             );
         }
         recyclerView.setLayoutManager(new GridLayoutManager(activity.getApplicationContext(), size));
-        BaseQuickAdapter<VideoFrame, BaseViewHolder> baseQuickAdapter = new BaseQuickAdapter<VideoFrame, BaseViewHolder>(R.layout.item_iv_mh, videoFrameList) {
+        BaseQuickAdapter<VideoFrame, BaseViewHolder> baseQuickAdapter = new BaseQuickAdapter<VideoFrame, BaseViewHolder>(R.layout.media_item_iv_mh, videoFrameList) {
             @Override
             protected void convert(BaseViewHolder helper, VideoFrame item) {
-                ImageView imageView = helper.getView(R.id.item_iv);
-                Glide.with(activity.getApplicationContext()).load(R.drawable.qiandao)
+                ImageView imageView = helper.getView(R.id.media_item_iv);
+                Glide.with(activity.getApplicationContext()).load(R.drawable.media_qiandao)
                         .apply(new RequestOptions().transform(new VideoFrameTransform(item)))
                         .into(imageView);
             }

media/app/src/main/java/com/kfzs/cfyl/media/dialog/DialogProgress.java

@@ -22,9 +22,9 @@ public class DialogProgress {
     }
     public static DialogProgress showDialog(Activity activity, boolean cancelable) {
         DialogProgress dialogShowLoading= new DialogProgress();
-        View view = View.inflate(activity, R.layout.dialog_progress, null);
+        View view = View.inflate(activity, R.layout.media_dialog_progress, null);
         TextView dialog_loading = view.findViewById(R.id.dialog_progress);
-        AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+        AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.media_MyDialogActivityTheme)
                 .setView(view)
                 .create();
         mAlertDialog.setCancelable(cancelable);

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtChooseEditList.java

@@ -39,12 +39,12 @@ public class FgtChooseEditList extends BaseFragment {
     }
 
     private void initView() {
-        fgt_choose_edit_list_ll = findViewById(R.id.fgt_choose_edit_list_ll);
-        fgt_choose_edit_line_v = findViewById(R.id.fgt_choose_edit_line_v);
-        fgt_choose_edit_view_pager = findViewById(R.id.fgt_choose_edit_view_pager);
-        fgt_choose_edit_filter_tv = findViewById(R.id.fgt_choose_edit_filter_tv);
-        fgt_choose_edit_buffing_tv = findViewById(R.id.fgt_choose_edit_buffing_tv);
-        fgt_choose_edit_warping_tv = findViewById(R.id.fgt_choose_edit_warping_tv);
+        fgt_choose_edit_list_ll = findViewById(R.id.media_fgt_choose_edit_list_ll);
+        fgt_choose_edit_line_v = findViewById(R.id.media_fgt_choose_edit_line_v);
+        fgt_choose_edit_view_pager = findViewById(R.id.media_fgt_choose_edit_view_pager);
+        fgt_choose_edit_filter_tv = findViewById(R.id.media_fgt_choose_edit_filter_tv);
+        fgt_choose_edit_buffing_tv = findViewById(R.id.media_fgt_choose_edit_buffing_tv);
+        fgt_choose_edit_warping_tv = findViewById(R.id.media_fgt_choose_edit_warping_tv);
         lastView = fgt_choose_edit_filter_tv;
     }
     private void initListener() {
@@ -96,7 +96,7 @@ public class FgtChooseEditList extends BaseFragment {
 
     //选择大眼瘦脸
     public void onSelectWarping(View view) {
-        G.showToast(getContext(), R.string.coming_soon);
+        G.showToast(getContext(), R.string.media_coming_soon);
     }
 
     private void changeCheckedState(View view) {

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtChooseFilterList.java

@@ -12,7 +12,6 @@ import com.kfzs.cfyl.media.BaseFragment;
 import com.kfzs.cfyl.media.R;
 import com.kfzs.cfyl.media.api.Filterble;
 import com.kfzs.cfyl.media.api.IFilter;
-import com.kfzs.cfyl.media.bean.BeautifyFilter;
 import com.kfzs.cfyl.media.bean.ColorBalanceFilter;
 import com.kfzs.cfyl.media.bean.Filter;
 import com.kfzs.cfyl.media.bean.Lp;
@@ -32,7 +31,7 @@ import java.util.List;
 public class FgtChooseFilterList extends BaseFragment {
     @Override
     public int getLayoutId() {
-        return R.layout.fgt_choose_filter_list;
+        return R.layout.media_fgt_choose_filter_list;
     }
 
     @Override
@@ -54,12 +53,12 @@ public class FgtChooseFilterList extends BaseFragment {
     private void initListener() {
         width = (G.WIDTH - recyclerView.getPaddingStart() - recyclerView.getPaddingEnd() / 2) / 5;
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-        recyclerView.setAdapter(new BaseQuickAdapter<IFilter, BaseViewHolder>(R.layout.item_tv_iv, filterList) {
+        recyclerView.setAdapter(new BaseQuickAdapter<IFilter, BaseViewHolder>(R.layout.media_item_tv_iv, filterList) {
             @Override
             protected void convert(BaseViewHolder helper, final IFilter item) {
                 LayoutParamsUtil.resetLayoutParams(helper.itemView, new Lp().setWidth(width));
                 helper.setText(R.id.item_tv, item.getName());
-                ImageView item_iv = helper.getView(R.id.item_iv);
+                ImageView item_iv = helper.getView(R.id.media_item_iv);
                 ViewUtil.setImage(item_iv, item);
                 helper.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtChooseLevelList.java

@@ -26,7 +26,7 @@ import java.util.List;
 public class FgtChooseLevelList extends BaseFragment {
     @Override
     public int getLayoutId() {
-        return R.layout.fgt_choose_level_list;
+        return R.layout.media_fgt_choose_level_list;
     }
 
     @Override
@@ -48,7 +48,7 @@ public class FgtChooseLevelList extends BaseFragment {
 
     private void initListener() {
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-        recyclerView.setAdapter(new BaseQuickAdapter<Integer, BaseViewHolder>(R.layout.item_level, list) {
+        recyclerView.setAdapter(new BaseQuickAdapter<Integer, BaseViewHolder>(R.layout.media_item_level, list) {
             @Override
             protected void convert(BaseViewHolder helper, final Integer item) {
                 CheckedTextView item_level_ctv = helper.getView(R.id.item_level_ctv);

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtDiscoveryTopic.java

@@ -22,7 +22,7 @@ public class FgtDiscoveryTopic extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return R.layout.common_rv;
+        return R.layout.media_common_rv;
     }
 
     private RecyclerView recyclerView;
@@ -59,7 +59,7 @@ public class FgtDiscoveryTopic extends BaseFragment {
     }
     private List<String > list;
     protected BaseQuickAdapter<String, BaseViewHolder> getAdapter() {
-        return new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_discovery_topic, list) {
+        return new BaseQuickAdapter<String, BaseViewHolder>(R.layout.media_item_discovery_topic, list) {
             @Override
             protected void convert(BaseViewHolder helper, String item) {
                 helper.setText(R.id.item_discovery_topic_content, item);

media/app/src/main/java/com/kfzs/cfyl/media/util/ViewUtil.java

@@ -87,7 +87,7 @@ public class ViewUtil {
     public static void setImage(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.drawable.sheep_logo);
+                imageView.setImageResource(R.drawable.media_sheep_logo);
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];

media/app/src/main/res/color/media_selector_color_white_40.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:color="@color/media_white" />
+    <item android:state_focused="true" android:color="@color/media_white" />
+    <item android:state_checked="true" android:color="@color/media_white"/>
+    <item android:state_selected="true" android:color="@color/media_white"/>
+    <item android:state_pressed="true" android:color="@color/media_white"/>
+    <item android:color="@color/media_white_40"/>
+</selector>

media/app/src/main/res/color/media_selector_color_white_black.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:color="@color/media_white" />
+    <item android:state_focused="true" android:color="@color/media_white" />
+    <item android:state_checked="true" android:color="@color/media_white"/>
+    <item android:state_selected="true" android:color="@color/media_white"/>
+    <item android:state_pressed="true" android:color="@color/media_white"/>
+    <item android:color="@color/media_black"/>
+</selector>

media/app/src/main/res/color/selector_color_white_40.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:color="@color/white" />
-    <item android:state_focused="true" android:color="@color/white" />
-    <item android:state_checked="true" android:color="@color/white"/>
-    <item android:state_selected="true" android:color="@color/white"/>
-    <item android:state_pressed="true" android:color="@color/white"/>
-    <item android:color="@color/white_40"/>
-</selector>

media/app/src/main/res/color/selector_color_white_black.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:color="@color/white" />
-    <item android:state_focused="true" android:color="@color/white" />
-    <item android:state_checked="true" android:color="@color/white"/>
-    <item android:state_selected="true" android:color="@color/white"/>
-    <item android:state_pressed="true" android:color="@color/white"/>
-    <item android:color="@color/black"/>
-</selector>

media/app/src/main/res/drawable/button_full_normal_gray.xml

@@ -5,6 +5,6 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/gray_6" />
-    <solid android:color="@color/gray_6" />
+        android:color="@color/media_gray_6" />
+    <solid android:color="@color/media_gray_6" />
 </shape>

media/app/src/main/res/drawable/button_full_normal_main_click.xml

@@ -4,6 +4,6 @@
     <corners android:radius="30dp" />
 
     <gradient
-        android:startColor="@color/theme_app_highlight_transparent"
-        android:endColor="@color/theme_app_highlight_more_transparent"/>
+        android:startColor="@color/media_theme_app_highlight_transparent"
+        android:endColor="@color/media_theme_app_highlight_more_transparent"/>
 </shape>

media/app/src/main/res/drawable/selector_button_full_main.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
-  <item android:state_focused="true" android:drawable="@drawable/button_full_normal_main_click" />
-  <item android:state_checked="true" android:drawable="@drawable/button_full_normal_main_click"/>
-  <item android:state_selected="true" android:drawable="@drawable/button_full_normal_main_click"/>
-  <item android:state_pressed="true" android:drawable="@drawable/button_full_normal_main_click"/>
-  <item android:drawable="@drawable/sp_bg_gradient_rectangle_blue"/>
+  <item android:state_enabled="false" android:drawable="@drawable/media_button_full_normal_gray" />
+  <item android:state_focused="true" android:drawable="@drawable/media_button_full_normal_main_click" />
+  <item android:state_checked="true" android:drawable="@drawable/media_button_full_normal_main_click"/>
+  <item android:state_selected="true" android:drawable="@drawable/media_button_full_normal_main_click"/>
+  <item android:state_pressed="true" android:drawable="@drawable/media_button_full_normal_main_click"/>
+  <item android:drawable="@drawable/media_sp_bg_gradient_rectangle_blue"/>
 </selector>

media/app/src/main/res/drawable/selector_oval_red_white.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:state_enabled="false" android:drawable="@drawable/shape_oval_white" />
-  <item android:state_focused="true" android:drawable="@drawable/shape_oval_red" />
-  <item android:state_checked="true" android:drawable="@drawable/shape_oval_red"/>
-  <item android:state_selected="true" android:drawable="@drawable/shape_oval_red"/>
-  <item android:state_pressed="true" android:drawable="@drawable/shape_oval_red"/>
-  <item android:drawable="@drawable/shape_oval_white"/>
+  <item android:state_enabled="false" android:drawable="@drawable/media_shape_oval_white" />
+  <item android:state_focused="true" android:drawable="@drawable/media_shape_oval_red" />
+  <item android:state_checked="true" android:drawable="@drawable/media_shape_oval_red"/>
+  <item android:state_selected="true" android:drawable="@drawable/media_shape_oval_red"/>
+  <item android:state_pressed="true" android:drawable="@drawable/media_shape_oval_red"/>
+  <item android:drawable="@drawable/media_shape_oval_white"/>
 </selector>

media/app/src/main/res/drawable/shape_oval_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/btn_color_main_stroke" />
+    <solid android:color="@color/media_btn_color_main_stroke" />
 </shape>

media/app/src/main/res/drawable/shape_oval_white.xml

@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <corners android:radius="20dp" />
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/media_red" />
 </shape>

media/app/src/main/res/drawable/shape_oval_red.xml

@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <corners android:radius="20dp" />
 
-    <solid android:color="@color/red" />
+    <solid android:color="@color/media_white" />
 </shape>

media/app/src/main/res/drawable/sp_bg_gradient_rectangle_blue.xml

@@ -3,8 +3,8 @@
     android:shape="rectangle">
 
     <gradient
-        android:startColor="@color/blue_start"
-        android:endColor="@color/blue_end"/>
+        android:startColor="@color/media_blue_start"
+        android:endColor="@color/media_blue_end"/>
 
     <corners
         android:radius="25dp"/>

media/app/src/main/res/layout/act_cut_video.xml

@@ -8,7 +8,7 @@
     tools:context=".activity.ActCutVideo">
 
     <VideoView
-        android:id="@+id/videoView"
+        android:id="@+id/media_videoView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -20,32 +20,32 @@
         android:background="#99000000" />
 
     <com.github.ybq.android.spinkit.SpinKitView
-        android:id="@+id/video_loading"
+        android:id="@+id/media_video_loading"
         style="@style/SpinKitView.Large.ThreeBounce"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:SpinKit_Color="@color/colorAccent"
+        app:SpinKit_Color="@color/media_colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/video_back_iv"
+        android:id="@+id/media_video_back_iv"
         android:layout_width="?attr/actionBarSize"
         android:layout_height="?attr/actionBarSize"
         android:layout_marginTop="20dp"
         android:onClick="onClickBackImg"
         android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_white"
+        android:src="@drawable/media_narrow_back_white"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/edit_video_topic_tv"
+        android:id="@+id/media_edit_video_topic_tv"
         android:layout_width="0dp"
         android:layout_height="30dp"
-        android:background="@drawable/shape_white_20_solid_rectangle_15"
+        android:background="@drawable/media_shape_white_20_solid_rectangle_15"
         android:gravity="center|start"
         android:maxLength="100"
         android:onClick="onClickTopic"
@@ -54,18 +54,18 @@
         android:text="#添加话题#"
         android:textColor="#FEFFFF"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@id/video_back_iv"
-        app:layout_constraintEnd_toStartOf="@id/edit_video_sure_tv"
-        app:layout_constraintStart_toEndOf="@id/video_back_iv"
-        app:layout_constraintTop_toTopOf="@id/video_back_iv" />
+        app:layout_constraintBottom_toBottomOf="@id/media_video_back_iv"
+        app:layout_constraintEnd_toStartOf="@id/media_edit_video_sure_tv"
+        app:layout_constraintStart_toEndOf="@id/media_video_back_iv"
+        app:layout_constraintTop_toTopOf="@id/media_video_back_iv" />
 
     <TextView
-        android:id="@+id/edit_video_sure_tv"
+        android:id="@+id/media_edit_video_sure_tv"
         android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="31dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/selector_button_full_main"
+        android:background="@drawable/media_selector_button_full_main"
         android:gravity="center"
         android:onClick="onClickSure"
         android:paddingTop="6dp"
@@ -73,21 +73,21 @@
         android:text="下一步"
         android:textColor="#FEFFFF"
         android:textSize="15sp"
-        app:layout_constraintBottom_toBottomOf="@id/video_back_iv"
+        app:layout_constraintBottom_toBottomOf="@id/media_video_back_iv"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/edit_video_topic_tv"
-        app:layout_constraintTop_toTopOf="@id/video_back_iv" />
+        app:layout_constraintStart_toEndOf="@id/media_edit_video_topic_tv"
+        app:layout_constraintTop_toTopOf="@id/media_video_back_iv" />
 
     <FrameLayout
-        android:id="@+id/frame_container"
+        android:id="@+id/media_frame_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginTop="27dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/edit_video_topic_tv" />
+        app:layout_constraintTop_toBottomOf="@id/media_edit_video_topic_tv" />
 
     <com.kfzs.cfyl.media.customview.VideoFramesView
-        android:id="@+id/videoFramesView"
+        android:id="@+id/media_videoFramesView"
         android:layout_width="match_parent"
         android:layout_height="69dp"
         android:layout_marginStart="36dp"
@@ -96,12 +96,12 @@
         app:layout_constraintBottom_toBottomOf="parent" />
 
     <TextView
-        android:id="@+id/edit_video_time_tv"
+        android:id="@+id/media_edit_video_time_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
         android:layout_marginBottom="100dp"
-        android:text="@string/has_choose_x_second"
+        android:text="@string/media_has_choose_x_second"
         android:textColor="#ffffffff"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"

media/app/src/main/res/layout/act_edit_video.xml

@@ -56,7 +56,7 @@
     </HorizontalScrollView>
 
     <FrameLayout
-        android:id="@+id/frame_container"
+        android:id="@+id/media_frame_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />
@@ -79,8 +79,8 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="27dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/shape_oval_main"
+        android:background="@drawable/media_shape_oval_main"
         android:onClick="onClickCommit"
         android:padding="5dp"
-        android:src="@drawable/qiandao" />
+        android:src="@drawable/media_qiandao" />
 </RelativeLayout>

media/app/src/main/res/layout/common_container.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/frame_container"
+    android:id="@+id/media_frame_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />

media/app/src/main/res/layout/custom_video_frames_view.xml

@@ -16,7 +16,7 @@
         android:background="#000" />
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/recyclerView"
+        android:id="@+id/media_recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="12dp"
@@ -30,18 +30,18 @@
         android:id="@+id/line_start"
         android:layout_width="6dp"
         android:layout_height="match_parent"
-        android:layout_alignStart="@id/recyclerView"
-        android:background="@drawable/shape_white_solid_rectangle_5" />
+        android:layout_alignStart="@id/media_recyclerView"
+        android:background="@drawable/media_shape_white_solid_rectangle_5" />
 
     <View
         android:id="@+id/line_end"
         android:layout_width="6dp"
         android:layout_height="match_parent"
-        android:layout_alignEnd="@id/recyclerView"
-        android:background="@drawable/shape_white_solid_rectangle_5" />
+        android:layout_alignEnd="@id/media_recyclerView"
+        android:background="@drawable/media_shape_white_solid_rectangle_5" />
 
     <include
-        layout="@layout/include_lll"
+        layout="@layout/media_include_lll"
         android:layout_width="5dp"
         android:layout_height="20dp"
         android:layout_alignParentEnd="true"
@@ -49,7 +49,7 @@
         android:layout_marginEnd="3dp" />
 
     <include
-        layout="@layout/include_lll"
+        layout="@layout/media_include_lll"
         android:layout_width="5dp"
         android:layout_height="20dp"
         android:layout_alignParentStart="true"

media/app/src/main/res/layout/dialog_loading.xml

@@ -15,7 +15,7 @@
             style="@style/SpinKitView.Large.ThreeBounce"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:SpinKit_Color="@color/colorAccent" />
+            app:SpinKit_Color="@color/media_colorAccent" />
 
         <TextView
             android:id="@+id/dialog_loading"
@@ -23,9 +23,9 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:gravity="center"
-            android:text="@string/data_loading"
+            android:text="@string/media_data_loading"
             android:visibility="gone"
-            android:textColor="@color/theme_app_info_dark"
+            android:textColor="@color/media_theme_app_info_dark"
             android:textSize="14sp" />
     </LinearLayout>
 </FrameLayout>

media/app/src/main/res/layout/dialog_progress.xml

@@ -15,7 +15,7 @@
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="@color/colorAccent" />
+            app:SpinKit_Color="@color/media_colorAccent" />
 
         <TextView
             android:id="@+id/dialog_progress"
@@ -24,7 +24,7 @@
             android:layout_centerInParent="true"
             android:gravity="center"
             android:text="0%"
-            android:textColor="@color/theme_app_info_dark"
+            android:textColor="@color/media_theme_app_info_dark"
             android:textSize="20sp" />
     </RelativeLayout>
 </FrameLayout>

media/app/src/main/res/layout/media_fgt_choose_edit_list.xml

@@ -2,29 +2,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_black_solid_rectangle_top_6"
+    android:background="@drawable/media_shape_black_solid_rectangle_top_6"
     android:orientation="vertical">
 
     <com.kfzs.cfyl.media.customview.NoScrollViewPager
-        android:id="@+id/fgt_choose_edit_view_pager"
+        android:id="@+id/media_fgt_choose_edit_view_pager"
         android:layout_width="match_parent"
         android:layout_height="122dp"/>
 
     <View
-        android:id="@+id/fgt_choose_edit_line_v"
+        android:id="@+id/media_fgt_choose_edit_line_v"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="#545454" />
 
     <LinearLayout
-        android:id="@+id/fgt_choose_edit_list_ll"
+        android:id="@+id/media_fgt_choose_edit_list_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal">
 
         <CheckedTextView
-            android:id="@+id/fgt_choose_edit_filter_tv"
+            android:id="@+id/media_fgt_choose_edit_filter_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -34,11 +34,11 @@
             android:paddingBottom="18dp"
             android:text="滤镜"
             android:textAlignment="center"
-            android:textColor="@color/selector_color_white_40"
+            android:textColor="@color/media_selector_color_white_40"
             android:textSize="15sp" />
 
         <CheckedTextView
-            android:id="@+id/fgt_choose_edit_buffing_tv"
+            android:id="@+id/media_fgt_choose_edit_buffing_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -47,11 +47,11 @@
             android:paddingBottom="18dp"
             android:text="磨皮"
             android:textAlignment="center"
-            android:textColor="@color/selector_color_white_40"
+            android:textColor="@color/media_selector_color_white_40"
             android:textSize="15sp" />
 
         <CheckedTextView
-            android:id="@+id/fgt_choose_edit_warping_tv"
+            android:id="@+id/media_fgt_choose_edit_warping_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -60,7 +60,7 @@
             android:paddingBottom="18dp"
             android:text="大眼瘦脸"
             android:textAlignment="center"
-            android:textColor="@color/selector_color_white_40"
+            android:textColor="@color/media_selector_color_white_40"
             android:textSize="15sp" />
     </LinearLayout>
 

media/app/src/main/res/layout/item_discovery_topic.xml

@@ -9,7 +9,7 @@
         android:layout_height="30dp"
         android:layout_centerHorizontal="true"
         android:layout_margin="10dp"
-        android:background="@drawable/shape_white_20_solid_rectangle_15"
+        android:background="@drawable/media_shape_white_20_solid_rectangle_15"
         android:gravity="center"
         android:maxLength="100"
         android:paddingStart="18dp"

media/app/src/main/res/layout/item_iv_mh.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/item_iv"
+    android:id="@+id/media_item_iv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:adjustViewBounds="true"

media/app/src/main/res/layout/item_level.xml

@@ -7,10 +7,10 @@
         android:id="@+id/item_level_ctv"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:background="@drawable/selector_oval_red_white"
+        android:background="@drawable/media_selector_oval_red_white"
         android:gravity="center"
         android:text="0"
         android:textAlignment="center"
-        android:textColor="@color/selector_color_white_black"
+        android:textColor="@color/media_selector_color_white_black"
         android:textSize="12sp" />
 </RelativeLayout>

media/app/src/main/res/layout/item_tv_iv.xml

@@ -16,7 +16,7 @@
         android:textSize="12sp" />
 
     <ImageView
-        android:id="@+id/item_iv"
+        android:id="@+id/media_item_iv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="5dp"

media/app/src/main/res/layout/title.xml

@@ -3,7 +3,7 @@
     android:id="@+id/layout_navigationBar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/white">
+    android:background="@color/media_white">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"
@@ -13,7 +13,7 @@
         android:gravity="center_vertical"
         android:minWidth="?attr/actionBarSize"
         android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black" />
+        android:src="@drawable/media_narrow_back_black" />
 
     <TextView
         android:id="@+id/txt_baseactivity_title"
@@ -26,12 +26,12 @@
         android:gravity="start"
         android:singleLine="true"
         android:text="@string/app_name"
-        android:textColor="@color/black_text_deep"
+        android:textColor="@color/media_black_text_deep"
         android:textSize="18sp" />
 
 
     <include
-        layout="@layout/title_bottom_line"
+        layout="@layout/media_title_bottom_line"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />

media/app/src/main/res/layout/title_bottom_line.xml

@@ -8,10 +8,10 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/white_ededed" />
+        android:background="@color/media_white_ededed" />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/white_FFF7F7F7" />
+        android:background="@color/media_white_FFF7F7F7" />
 </LinearLayout>

media/app/src/main/res/values/colors.xml

@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-    <color name="gray_6">#D9D9D9</color>
-    <color name="blue_start">#80d2fe</color>
-    <color name="blue_end">#1394e8</color>
-    <color name="theme_app_highlight_transparent">#cc29d6fd</color>
-    <color name="theme_app_highlight_more_transparent">#cc34a5e7</color>
-    <color name="btn_color_main_stroke">#2EBEF2</color>
-    <color name="theme_app_info_dark">#3b93e5</color>
-    <color name="white_40">#66ffffff</color>
-    <color name="white">#ffffff</color>
-    <color name="red">#ff0000</color>
-    <color name="black">#000000</color>
-    <color name="white_ededed">#ededed</color>
-    <color name="white_FFF7F7F7">#FFF7F7F7</color>
-    <color name="black_text_deep">#333333</color>
+    <!--APP的相关主要颜色值-->
+    <color name="media_colorPrimary">@color/media_white_DEDEDE</color>
+    <color name="media_colorPrimaryDark">@color/media_white_DEDEDE</color>
+    <color name="media_colorAccent">@color/media_white_DEDEDE</color>
+    <color name="media_colorControlNormal">@color/media_black_6_3</color>
+    <color name="media_white_DEDEDE">#DEDEDE</color>
+    <color name="media_black_6_3">#333333</color>
+    <color name="media_gray_6">#D9D9D9</color>
+    <color name="media_blue_start">#80d2fe</color>
+    <color name="media_blue_end">#1394e8</color>
+    <color name="media_theme_app_highlight_transparent">#cc29d6fd</color>
+    <color name="media_theme_app_highlight_more_transparent">#cc34a5e7</color>
+    <color name="media_btn_color_main_stroke">#2EBEF2</color>
+    <color name="media_theme_app_info_dark">#3b93e5</color>
+    <color name="media_white_40">#66ffffff</color>
+    <color name="media_white">#ffffff</color>
+    <color name="media_red">#ff0000</color>
+    <color name="media_black">#000000</color>
+    <color name="media_white_ededed">#ededed</color>
+    <color name="media_white_FFF7F7F7">#FFF7F7F7</color>
+    <color name="media_black_text_deep">#333333</color>
 </resources>

media/app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">media</string>
-    <string name="has_choose_x_second">已选取 %s秒</string>
-    <string name="data_loading">数据加载中&#8230;</string>
-    <string name="coming_soon">敬请期待</string>
+    <string name="media_has_choose_x_second">已选取 %s秒</string>
+    <string name="media_data_loading">数据加载中&#8230;</string>
+    <string name="media_coming_soon">敬请期待</string>
 </resources>

media/app/src/main/res/values/styles.xml

@@ -1,20 +1,20 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="media_AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/media_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/media_colorPrimaryDark</item>
+        <item name="colorAccent">@color/media_colorAccent</item>
     </style>
-    <style name="AppNoActionTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="media_AppNoActionTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/media_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/media_colorPrimaryDark</item>
+        <item name="colorAccent">@color/media_colorAccent</item>
     </style>
 
-    <style name="MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
+    <style name="media_MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->
         <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
         <item name="android:windowIsTranslucent">false</item><!--半透明-->