Commit e15654b1 authored by Han Ruisong's avatar Han Ruisong
Browse files

feat: 更新到v3.15.1

增加离线跑马灯功能
parent d05840be
File deleted
...@@ -33,7 +33,7 @@ dependencies { ...@@ -33,7 +33,7 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
//获得场景视频SDK,必须引入 //获得场景视频SDK,必须引入
implementation 'com.bokecc:CCVOD:3.15.0' implementation 'com.bokecc:CCVOD:3.15.1'
//必须引用commonLib //必须引用commonLib
implementation 'com.bokecc:commonLib:0.1.12' implementation 'com.bokecc:commonLib:0.1.12'
//必须引用 //必须引用
......
...@@ -4,239 +4,243 @@ ...@@ -4,239 +4,243 @@
"_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.", "_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
"entities": [ "entities": [
{ {
"id": "1:8768526305188734432", "id": "1:8105040308776709834",
"lastPropertyId": "16:8075305095870498023", "lastPropertyId": "17:5808093742337430291",
"name": "DownloadInfo", "name": "DownloadInfo",
"properties": [ "properties": [
{ {
"id": "1:8403337342647340025", "id": "1:8039733267221120719",
"name": "id" "name": "id"
}, },
{ {
"id": "2:6505193976292401154", "id": "2:4059354602378719011",
"name": "videoId" "name": "videoId"
}, },
{ {
"id": "3:1446677165725264065", "id": "3:2651063049410234003",
"name": "title" "name": "title"
}, },
{ {
"id": "4:4220842065152559105", "id": "4:8431285169701121777",
"name": "format" "name": "format"
}, },
{ {
"id": "5:7803872055355250992", "id": "5:8436349111347164380",
"name": "downloadMode" "name": "downloadMode"
}, },
{ {
"id": "6:9049288209764088931", "id": "6:3921987217561314349",
"name": "videoCover" "name": "videoCover"
}, },
{ {
"id": "7:1936982348339523809", "id": "7:7759657121101185484",
"name": "start" "name": "start"
}, },
{ {
"id": "8:2904966229102648757", "id": "8:7937518604644987101",
"name": "end" "name": "end"
}, },
{ {
"id": "9:1962358382313393756", "id": "9:7718929532844022276",
"name": "status" "name": "status"
}, },
{ {
"id": "10:5492754050221785847", "id": "10:6926072102982124274",
"name": "createTime" "name": "createTime"
}, },
{ {
"id": "11:195409674161015319", "id": "11:4604355265909281248",
"name": "definition" "name": "definition"
}, },
{ {
"id": "12:8638392584303409457", "id": "12:6455840348889094151",
"name": "firstSubtitleStatus" "name": "firstSubtitleStatus"
}, },
{ {
"id": "13:6949084780448653041", "id": "13:1167022977712328498",
"name": "secondSubtitleStatus" "name": "secondSubtitleStatus"
}, },
{ {
"id": "14:8385818052262541025", "id": "14:4265165261306440002",
"name": "subtitleNum" "name": "subtitleNum"
}, },
{ {
"id": "15:7451937971450745534", "id": "15:5284581815255197125",
"name": "logoPath" "name": "logoPath"
}, },
{ {
"id": "16:8075305095870498023", "id": "16:5133081747593224541",
"name": "subtitleModel" "name": "subtitleModel"
},
{
"id": "17:5808093742337430291",
"name": "marqueeData"
} }
], ],
"relations": [] "relations": []
}, },
{ {
"id": "2:6649355820352023138", "id": "2:5219719017710622568",
"lastPropertyId": "32:5853698447561458034", "lastPropertyId": "32:376559135715796064",
"name": "UploadInfo", "name": "UploadInfo",
"properties": [ "properties": [
{ {
"id": "1:8387880763741931373", "id": "1:255097516228580543",
"name": "id" "name": "id"
}, },
{ {
"id": "2:5202281855456314070", "id": "2:4862782265438399254",
"name": "uploadId" "name": "uploadId"
}, },
{ {
"id": "3:414852080882565225", "id": "3:9184514539294307358",
"name": "start" "name": "start"
}, },
{ {
"id": "4:4436394142827028956", "id": "4:4407893841341240535",
"name": "end" "name": "end"
}, },
{ {
"id": "5:9159809636479666823", "id": "5:6834705732509632258",
"name": "status" "name": "status"
}, },
{ {
"id": "6:8728392785962589693", "id": "6:3755293600480825639",
"name": "progress" "name": "progress"
}, },
{ {
"id": "7:3926515601035295743", "id": "7:8014970106600024445",
"name": "title" "name": "title"
}, },
{ {
"id": "8:3472254776078907922", "id": "8:211801046912231571",
"name": "tag" "name": "tag"
}, },
{ {
"id": "9:4556251465110735478", "id": "9:3805718908445419296",
"name": "desc" "name": "desc"
}, },
{ {
"id": "10:6462529601629422651", "id": "10:1195929207222222204",
"name": "filePath" "name": "filePath"
}, },
{ {
"id": "11:8766746511901802495", "id": "11:3854292479791803570",
"name": "videoCoverPath" "name": "videoCoverPath"
}, },
{ {
"id": "12:6610893761283564255", "id": "12:2948601501048763826",
"name": "categoryId" "name": "categoryId"
}, },
{ {
"id": "13:7208079175202262527", "id": "13:6493975000001073703",
"name": "uploadOrResume" "name": "uploadOrResume"
}, },
{ {
"id": "14:4418901835854856049", "id": "14:9123508158748615788",
"name": "videoId" "name": "videoId"
}, },
{ {
"id": "15:6027799538921557682", "id": "15:7130366175908225544",
"name": "server" "name": "server"
}, },
{ {
"id": "16:1994206540371720144", "id": "16:353062928571240072",
"name": "servicetype" "name": "servicetype"
}, },
{ {
"id": "17:8835303554074081155", "id": "17:5177451697264586973",
"name": "creationTime" "name": "creationTime"
}, },
{ {
"id": "18:1384995516766379914", "id": "18:136388475175600880",
"name": "priority" "name": "priority"
}, },
{ {
"id": "19:9030720320642459459", "id": "19:6747895821541271233",
"name": "fileName" "name": "fileName"
}, },
{ {
"id": "20:6862849274129351807", "id": "20:3527353752901215004",
"name": "encodetype" "name": "encodetype"
}, },
{ {
"id": "21:1295764890849593971", "id": "21:4156765761969146925",
"name": "md5" "name": "md5"
}, },
{ {
"id": "22:7676352544216585979", "id": "22:3931966140914644823",
"name": "fileByteSize" "name": "fileByteSize"
}, },
{ {
"id": "23:3643475283016949792", "id": "23:465646228868534846",
"name": "isCrop" "name": "isCrop"
}, },
{ {
"id": "24:7807872492173303372", "id": "24:1603251036511352797",
"name": "expectWidth" "name": "expectWidth"
}, },
{ {
"id": "25:3417092904932790710", "id": "25:7900344661796872603",
"name": "corner" "name": "corner"
}, },
{ {
"id": "26:8922674244185251216", "id": "26:5389773560117934299",
"name": "offsetx" "name": "offsetx"
}, },
{ {
"id": "27:345385008092894003", "id": "27:5635259923654136266",
"name": "offsety" "name": "offsety"
}, },
{ {
"id": "28:570882708970630771", "id": "28:6127743617446753140",
"name": "fontfamily" "name": "fontfamily"
}, },
{ {
"id": "29:7241625263332694810", "id": "29:3303482383130782347",
"name": "fontsize" "name": "fontsize"
}, },
{ {
"id": "30:5440028499858819373", "id": "30:7815379264503091829",
"name": "fontcolor" "name": "fontcolor"
}, },
{ {
"id": "31:2256770575453430808", "id": "31:2777526072822071055",
"name": "fontalpha" "name": "fontalpha"
}, },
{ {
"id": "32:5853698447561458034", "id": "32:376559135715796064",
"name": "text" "name": "text"
} }
], ],
"relations": [] "relations": []
}, },
{ {
"id": "3:2876455800580781639", "id": "3:1932175777996060843",
"lastPropertyId": "4:5942944285330377468", "lastPropertyId": "4:6729974564801104336",
"name": "VideoPosition", "name": "VideoPosition",
"properties": [ "properties": [
{ {
"id": "1:1962738583933436905", "id": "1:5779509710981130260",
"name": "id" "name": "id"
}, },
{ {
"id": "2:3994122668329660665", "id": "2:566034591307766224",
"name": "videoId" "name": "videoId"
}, },
{ {
"id": "3:5383099004811845369", "id": "3:7264609046101814386",
"name": "position" "name": "position"
}, },
{ {
"id": "4:5942944285330377468", "id": "4:6729974564801104336",
"name": "isPlayCompleted" "name": "isPlayCompleted"
} }
], ],
"relations": [] "relations": []
} }
], ],
"lastEntityId": "3:2876455800580781639", "lastEntityId": "3:1932175777996060843",
"lastIndexId": "0:0", "lastIndexId": "0:0",
"lastRelationId": "0:0", "lastRelationId": "0:0",
"lastSequenceId": "0:0", "lastSequenceId": "0:0",
......
...@@ -8,13 +8,16 @@ package com.bokecc.vod; ...@@ -8,13 +8,16 @@ package com.bokecc.vod;
public class ConfigUtil { public class ConfigUtil {
/** /**
* 账号ID 可以替换为自己的USER_ID * 账号ID 可以替换为自己的USER_ID
*
*/ */
public static final String USER_ID = "391E6E3340A00767"; public static final String USER_ID = "391E6E3340A00767";
/** /**
* 可以替换为自己的API_KEY * 可以替换为自己的API_KEY
*
*/ */
public static final String API_KEY = "T8WdOUuvFEiOsou1xjDr4U73v12M7iNa"; public static final String API_KEY = "T8WdOUuvFEiOsou1xjDr4U73v12M7iNa";
/** /**
* 获取视频信息的地址 * 获取视频信息的地址
*/ */
......
...@@ -17,10 +17,6 @@ import android.widget.Button; ...@@ -17,10 +17,6 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.bokecc.sdk.mobile.download.DownloadOperator;
import com.bokecc.sdk.mobile.download.VodDownloadBean;
import com.bokecc.sdk.mobile.download.VodDownloadManager;
import com.bokecc.sdk.mobile.util.HttpUtil;
import com.bokecc.vod.adapter.PlayVideoAdapter; import com.bokecc.vod.adapter.PlayVideoAdapter;
import com.bokecc.vod.data.DataSet; import com.bokecc.vod.data.DataSet;
import com.bokecc.vod.data.DataUtil; import com.bokecc.vod.data.DataUtil;
...@@ -117,7 +113,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -117,7 +113,7 @@ public class MainActivity extends AppCompatActivity {
gv_video_list.addHeaderView(headView); gv_video_list.addHeaderView(headView);
videoDatas = new ArrayList<>(); videoDatas = new ArrayList<>();
//TODO for test 配置自己的视频时取消这行注释 //配置自己的视频时取消这行注释
// videoDatas = DataUtil.getVideoList(); // videoDatas = DataUtil.getVideoList();
playVideoAdapter = new PlayVideoAdapter(MainActivity.this, videoDatas); playVideoAdapter = new PlayVideoAdapter(MainActivity.this, videoDatas);
...@@ -217,12 +213,13 @@ public class MainActivity extends AppCompatActivity { ...@@ -217,12 +213,13 @@ public class MainActivity extends AppCompatActivity {
private void initData() { private void initData() {
new Thread(new Runnable() { videoDatas = DataUtil.getVideoList();
@Override // new Thread(new Runnable() {
public void run() { // @Override
request(); // public void run() {
} // request();
}).start(); // }
// }).start();
} }
private void request() { private void request() {
......
...@@ -16,7 +16,7 @@ public class DanmuColorAdapter extends RecyclerView.Adapter<DanmuColorAdapter.Vi ...@@ -16,7 +16,7 @@ public class DanmuColorAdapter extends RecyclerView.Adapter<DanmuColorAdapter.Vi
private List<DanmuColorInfo> mData; private List<DanmuColorInfo> mData;
private boolean isPortrait = false; private boolean isPortrait = false;
private DanmuColorAdapter.OnItemClickListener onItemClickListener; private OnItemClickListener onItemClickListener;
public DanmuColorAdapter(List<DanmuColorInfo> mData, boolean isPortrait) { public DanmuColorAdapter(List<DanmuColorInfo> mData, boolean isPortrait) {
this.mData = mData; this.mData = mData;
......
...@@ -14,7 +14,6 @@ import android.widget.LinearLayout; ...@@ -14,7 +14,6 @@ import android.widget.LinearLayout;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.TextView; import android.widget.TextView;
import com.bokecc.sdk.mobile.util.HttpUtil;
import com.bokecc.vod.R; import com.bokecc.vod.R;
import com.bokecc.vod.data.ExeQuestion; import com.bokecc.vod.data.ExeQuestion;
import com.bokecc.vod.data.ExerciseAnswer; import com.bokecc.vod.data.ExerciseAnswer;
......
package com.bokecc.vod.adapter; package com.bokecc.vod.adapter;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
......
package com.bokecc.vod.adapter; package com.bokecc.vod.adapter;
import android.content.Context;