developOne / harmonyPool

01 Feb, 2024 14 commits
- Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main · 1b42c106
  1b42c106 Browse Files
  
  wanglei authored 2024-02-01 21:10:26 +0800
- 删除重复的VideoInfo，LiveInfo改名为LiveInfoDTO · 8a053933 ...
  8a053933 Browse Files
```
当获取播放地址错误时，给出Toast
```
  fanmingyou3_wd authored 2024-02-01 20:46:18 +0800
- 把mock_switch改为false,使用在线数据 · 6711f499
  6711f499 Browse Files
  
  fanmingyou3_wd authored 2024-02-01 19:58:11 +0800
- 把DevEco3.1的PeopleDaily_Harmony中的代码合并到DevEco4.0的sight_harmony中，修复没有参与编译而没有报错的文件 · 888492e3
  888492e3 Browse Files
  
  fanmingyou3_wd authored 2024-02-01 19:48:12 +0800
- Revert "图文详情页面" · 56865770 ...
  56865770 Browse Files
```
This reverts commit 5a666434.
```
  wanglei authored 2024-02-01 18:37:37 +0800
- Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main · 499cd3fe
  499cd3fe Browse Files
  
  wanglei authored 2024-02-01 18:35:43 +0800
- 枚举值修改 · 04ec18b1
  04ec18b1 Browse Files
  
  wanglei authored 2024-02-01 18:35:02 +0800
- 图文详情页面 · 5a666434
  5a666434 Browse Files
  
  liujian1_wd authored 2024-02-01 17:44:03 +0800
- 图文详情页面 · d71d7740
  d71d7740 Browse Files
  
  liujian1_wd authored 2024-02-01 17:36:28 +0800
- 图文详情页面 · 14f26591
  14f26591 Browse Files
  
  liujian1_wd authored 2024-02-01 16:26:09 +0800
- 解决语法检查报错 · 9a3128b9
  9a3128b9 Browse Files
  
  fanmingyou3_wd authored 2024-02-01 15:54:46 +0800
- 头图卡类型 · 57ed2f8a
  57ed2f8a Browse Files
  
  caohuahui authored 2024-02-01 15:02:53 +0800
- 视频直播横划卡 · dbc7a748
  dbc7a748 Browse Files
  
  yanlu1_wd authored 2024-02-01 14:53:17 +0800
- 视频直播横划卡16:9 · 56e5e53e
  56e5e53e Browse Files
  
  yanlu1_wd authored 2024-02-01 14:47:22 +0800
31 Jan, 2024 10 commits
- Merge remote-tracking branch 'origin/main' into main · e73c7d7a
  e73c7d7a Browse Files
  
  lichengjun authored 2024-01-31 18:33:52 +0800
- 大图卡(compstyle-2)，三图卡(compstyle-4)UI · 9500f178
  9500f178 Browse Files
  
  lichengjun authored 2024-01-31 18:33:34 +0800
- 图文详情页面 · 17f56b9b
  17f56b9b Browse Files
  
  liujian1_wd authored 2024-01-31 18:15:37 +0800
- Merge remote-tracking branch 'origin/main' into main · 44cd7601 ...
  44cd7601 Browse Files
```
# Conflicts:
#	PeopleDaily_Harmony/wdComponent/src/main/ets/Index.ets
#	PeopleDaily_Harmony/wdComponent/src/main/ets/components/PageComponent.ets
#	PeopleDaily_Harmony/wdComponent/src/main/ets/repository/bean/ContentDTO.ets
```
  lichengjun authored 2024-01-31 18:14:19 +0800
- 大图卡(compstyle-2)，三图卡(compstyle-4)UI · bcb76529
  bcb76529 Browse Files
  
  lichengjun authored 2024-01-31 18:10:26 +0800
- 单图卡，2行/3行 comp提交 · b75ed162
  b75ed162 Browse Files
  
  guochunsong authored 2024-01-31 17:44:01 +0800
- 新增详情接口合并到4.0 · f648eff0
  f648eff0 Browse Files
  
  zhangbo1_wd authored 2024-01-31 11:20:34 +0800
- 新增详情接口请求 · 16f3631f
  16f3631f Browse Files
  
  zhangbo1_wd authored 2024-01-31 11:11:52 +0800
- 电子报页面 · ac0eedcb
  ac0eedcb Browse Files
  
  liujian1_wd authored 2024-01-31 10:37:38 +0800
- 把DevEco3.1的PeopleDaily_Harmony中的代码合并到DevEco4.0的sight_harmony中，修复没有参与编译而没有报错的文件 · 301e83fe
  301e83fe Browse Files
  
  fanmingyou3_wd authored 2024-01-31 10:30:54 +0800
30 Jan, 2024 3 commits
- 把DevEco3.1的PeopleDaily_Harmony中的代码合并到DevEco4.0的sight_harmony中 · 0a7cbd64
  0a7cbd64 Browse Files
  
  fanmingyou3_wd authored 2024-01-31 01:48:49 +0800
- 新增页面跳转接口 · dda92c7f
  dda92c7f Browse Files
  
  zhangbo1_wd authored 2024-01-30 16:25:01 +0800
- 添加播放器模块，及短视频详情播放模块 · 33c36797
  33c36797 Browse Files
  
  fanmingyou3_wd authored 2024-01-30 10:41:11 +0800
29 Jan, 2024 6 commits
- 电子报页面 · d5762a68
  d5762a68 Browse Files
  
  liujian1_wd authored 2024-01-29 16:44:46 +0800
- 冲突调整 · 494b9d9d
  494b9d9d Browse Files
  
  yangsunyue_wd authored 2024-01-29 11:12:43 +0800
- 冲突调整 · fd100d24
  fd100d24 Browse Files
  
  yangsunyue_wd authored 2024-01-29 11:09:28 +0800
- 头图卡 · b60b8faa
  b60b8faa Browse Files
  
  caohuahui authored 2024-01-29 10:54:43 +0800
- Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool · 89893b31 ...
  89893b31 Browse Files
```
# Conflicts:
#	PeopleDaily_Harmony/wdComponent/src/main/ets/components/PageComponent.ets
#	PeopleDaily_Harmony/wdComponent/src/main/resources/base/element/color.json
```
  yangsunyue_wd authored 2024-01-29 10:12:56 +0800
- 横滑卡3:2 UI · e64412b7
  e64412b7 Browse Files
  
  yangsunyue_wd authored 2024-01-29 10:03:53 +0800
27 Jan, 2024 7 commits
- 电子报页面 · 89a36878
  89a36878 Browse Files
  
  liujian1_wd authored 2024-01-27 17:52:32 +0800
- 新增二级栏目页面 · 02661442
  02661442 Browse Files
  
  zhangbo1_wd authored 2024-01-27 17:29:28 +0800
- 解决冲突 · 44f5dcda
  44f5dcda Browse Files
  
  zhangbo1_wd authored 2024-01-27 16:28:57 +0800
- Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool · d2095a61 ...
  d2095a61 Browse Files
```
# Conflicts:
#	PeopleDaily_Harmony/wdComponent/src/main/ets/Index.ets
```
  zhangbo1_wd authored 2024-01-27 16:18:04 +0800
- 包结构调整 · 721bd41b
  721bd41b Browse Files
  
  zhangbo1_wd authored 2024-01-27 16:14:40 +0800
- 电子报页面 · d2dca6e9
  d2dca6e9 Browse Files
  
  liujian1_wd authored 2024-01-27 16:01:08 +0800
- 页面布局里拆除comp解析逻辑；新增tab页面数据请求逻辑，避免初始化而大量接口请求 · c38bb9af
  c38bb9af Browse Files
  
  zhangbo1_wd authored 2024-01-27 15:59:34 +0800