Skip to content

Commit 6921092

Browse files
author
lucas
committed
Merge branch 'dev_2.9.0' into dev_lucas
2 parents f7ecca0 + 467e3fa commit 6921092

File tree

14 files changed

+752
-124
lines changed

14 files changed

+752
-124
lines changed

‎VideoOS/LuaViewSDK/src/com/taobao/luaview/fun/mapper/ui/UIViewMethodMapper.java‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import android.text.TextUtils;
1212
import android.util.Log;
13+
import android.view.View;
1314
import android.widget.RelativeLayout;
1415

1516
import com.taobao.luaview.fun.base.BaseMethodMapper;
@@ -146,7 +147,10 @@ public class UIViewMethodMapper<U extends UDView> extends BaseMethodMapper<U> {
146147
"onTouch",//105
147148
"mqttCallback",//106
148149
"tag",//107
149-
"cornerRadii"//108
150+
"cornerRadii",//108
151+
"layerTypeNone",//109
152+
"layerTypeSoftware",//110
153+
"layerTypeHardware"//111
150154
};
151155

152156
public Varargs tag(U view, Varargs varargs) {
@@ -390,6 +394,12 @@ public Varargs invoke(int code, U target, Varargs varargs) {
390394
return tag(target, varargs);
391395
case 108:
392396
return cornerRadii(target, varargs);
397+
case 109:
398+
return layerTypeNone(target, varargs);
399+
case 110:
400+
return layerTypeSoftware(target, varargs);
401+
case 111:
402+
return layerTypeHardware(target, varargs);
393403

394404
}
395405
return super.invoke(code, target, varargs);
@@ -2298,6 +2308,38 @@ public LuaValue setCornerRadii(U view, Varargs varargs) {
22982308
return view.setCornerRadii(radii);
22992309
}
23002310

2311+
/**
2312+
* 指定支持该视图的层的类型
2313+
*
2314+
* @param view
2315+
* @param varargs
2316+
* @return
2317+
*/
2318+
public LuaValue layerTypeNone(U view, Varargs varargs) {
2319+
return view.setLayerType(View.LAYER_TYPE_NONE);
2320+
}
2321+
2322+
/**
2323+
* 指定支持该视图的层的类型
2324+
*
2325+
* @param view
2326+
* @param varargs
2327+
* @return
2328+
*/
2329+
public LuaValue layerTypeSoftware(U view, Varargs varargs) {
2330+
return view.setLayerType(View.LAYER_TYPE_SOFTWARE);
2331+
}
2332+
2333+
/**
2334+
* 指定支持该视图的层的类型
2335+
*
2336+
* @param view
2337+
* @param varargs
2338+
* @return
2339+
*/
2340+
public LuaValue layerTypeHardware(U view, Varargs varargs) {
2341+
return view.setLayerType(View.LAYER_TYPE_HARDWARE);
2342+
}
23012343

23022344
/**
23032345
* 开始动画

‎VideoOS/LuaViewSDK/src/com/taobao/luaview/userdata/ui/UDView.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,14 @@ public UDView setCornerRadii(float[] radii) {
340340
return this;
341341
}
342342

343+
public UDView setLayerType(int type) {
344+
T view = getView();
345+
if (view != null) {
346+
view.setLayerType(type, null);
347+
}
348+
return this;
349+
}
350+
343351
/**
344352
* 边框宽度
345353
*
@@ -1174,7 +1182,7 @@ public boolean onTouch(View v, MotionEvent event) {
11741182
}
11751183
}
11761184

1177-
if(!LuaUtil.isValid(UDView.this.mOnClick) && !LuaUtil.isValid(UDView.this.mOnLongClick)){
1185+
if (!LuaUtil.isValid(UDView.this.mOnClick) && !LuaUtil.isValid(UDView.this.mOnLongClick)) {
11781186
return false;
11791187
}
11801188

‎VideoOS/VenvyLibrary/src/main/assets/lua/main.lua‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,12 +391,17 @@ local function getTaglist()
391391

392392
--下载投放的lua文件
393393
local luaList = {}
394+
--按id去重
394395
for i,v in ipairs(dataTable) do
395396
if (v.miniAppInfo ~= nil ) then
396-
Native:preloadMiniAppLua(v.miniAppInfo)
397+
luaList[v.miniAppInfo.miniAppId] = v.miniAppInfo
397398
end
398399
end
399400

401+
for k,v in pairs(luaList) do
402+
Native:preloadMiniAppLua(v)
403+
end
404+
400405
--osTypeVideoOS = 1, osTypeLiveOS = 2, 点播按时间点加载，直播直接加载
401406
if Native:osType() < osTypeLiveOS then
402407
print("osTypeVideoOS")

‎VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/Platform.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import cn.com.venvy.common.interf.WedgeListener;
2929
import cn.com.venvy.common.media.StorageUtils;
3030
import cn.com.venvy.common.media.file.Md5FileNameGenerator;
31+
import cn.com.venvy.common.report.Report;
3132
import cn.com.venvy.common.statistics.VenvyStatisticsManager;
3233
import cn.com.venvy.common.track.TrackHelper;
3334
import cn.com.venvy.common.utils.VenvyAsyncTaskUtil;
@@ -71,6 +72,7 @@ public Platform(PlatformInfo platformInfo) {
7172
mPlatformInfo = platformInfo;
7273
}
7374
TrackHelper.init(this);
75+
Report.initReport(this);
7476
}
7577

7678
public void setContentViewGroup(ViewGroup contentViewGroup) {
@@ -192,43 +194,43 @@ public void preloadImage(final String[] imageUrls, final TaskListener taskListen
192194
mDownloadImageTaskRunner.startTasks(arrayList, new TaskListener<DownloadImageTask, Boolean>() {
193195
@Override
194196
public boolean isFinishing() {
195-
if(taskListener != null){
197+
if (taskListener != null) {
196198
return taskListener.isFinishing();
197199
}
198200
return false;
199201
}
200202

201203
@Override
202204
public void onTaskStart(DownloadImageTask downloadImageTask) {
203-
if(taskListener != null){
205+
if (taskListener != null) {
204206
taskListener.onTaskStart(downloadImageTask);
205207
}
206208
}
207209

208210
@Override
209211
public void onTaskProgress(DownloadImageTask downloadImageTask, int progress) {
210-
if(taskListener != null){
212+
if (taskListener != null) {
211213
taskListener.onTaskProgress(downloadImageTask, progress);
212214
}
213215
}
214216

215217
@Override
216218
public void onTaskFailed(DownloadImageTask downloadImageTask, @Nullable Throwable throwable) {
217-
if(taskListener != null){
219+
if (taskListener != null) {
218220
taskListener.onTaskFailed(downloadImageTask, throwable);
219221
}
220222
}
221223

222224
@Override
223225
public void onTaskSuccess(DownloadImageTask downloadImageTask, Boolean aBoolean) {
224-
if(taskListener != null){
226+
if (taskListener != null) {
225227
taskListener.onTaskSuccess(downloadImageTask, aBoolean);
226228
}
227229
}
228230

229231
@Override
230232
public void onTasksComplete(@Nullable List<DownloadImageTask> successfulTasks, @Nullable List<DownloadImageTask> failedTasks) {
231-
if(taskListener != null){
233+
if (taskListener != null) {
232234
taskListener.onTasksComplete(successfulTasks, failedTasks);
233235
}
234236
}
@@ -251,46 +253,46 @@ public void preloadMedia(final String[] mediaUrls, final TaskListener taskListen
251253
mDownloadTaskRunner.startTasks(arrayList, new TaskListener<DownloadTask, Boolean>() {
252254
@Override
253255
public boolean isFinishing() {
254-
if(taskListener != null){
256+
if (taskListener != null) {
255257
return taskListener.isFinishing();
256258
}
257259
return false;
258260
}
259261

260262
@Override
261263
public void onTaskStart(DownloadTask downloadTask) {
262-
if(taskListener != null){
264+
if (taskListener != null) {
263265
taskListener.onTaskStart(downloadTask);
264266
}
265267
}
266268

267269
@Override
268270
public void onTaskProgress(DownloadTask downloadTask, int progress) {
269-
if(taskListener != null){
271+
if (taskListener != null) {
270272
taskListener.onTaskProgress(downloadTask, progress);
271273
}
272274
}
273275

274276
@Override
275277
public void onTaskFailed(DownloadTask downloadTask, @Nullable Throwable throwable) {
276-
if(taskListener != null){
278+
if (taskListener != null) {
277279
taskListener.onTaskFailed(downloadTask, throwable);
278-
}else {
280+
} else {
279281
downloadTask.failed();
280282
}
281283
}
282284

283285
@Override
284286
public void onTaskSuccess(DownloadTask downloadTask, Boolean aBoolean) {
285-
if(taskListener != null){
287+
if (taskListener != null) {
286288
taskListener.onTaskSuccess(downloadTask, aBoolean);
287289
}
288290
}
289291

290292
@Override
291293
public void onTasksComplete(@Nullable List<DownloadTask> successfulTasks, @Nullable List<DownloadTask> failedTasks) {
292-
VenvyStatisticsManager.getInstance().submitFileStatisticsInfo(successfulTasks,Platform.STATISTICS_DOWNLOAD_STAGE_REVIDEO);
293-
if(taskListener != null){
294+
VenvyStatisticsManager.getInstance().submitFileStatisticsInfo(successfulTasks, Platform.STATISTICS_DOWNLOAD_STAGE_REVIDEO);
295+
if (taskListener != null) {
294296
taskListener.onTasksComplete(successfulTasks, failedTasks);
295297
}
296298
}

0 commit comments

Comments
 (0)