Skip to content

Commit f6e57b1

Browse files
larrytinlarrytin
committed
branch
1 parent 823135f commit f6e57b1

File tree

96 files changed

+9130
-1722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+9130
-1722
lines changed

‎.github/scripts/updateVersionCodeForSnapshot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ secondtag=${vtaglist[1]}
1515
thirdtag=${vtaglist[2]}
1616
thirdtag=`expr $thirdtag + 1`
1717

18-
new_version=$firsttag.$secondtag.$thirdtag
18+
new_version=$firsttag.$secondtag.$thirdtag.$(date "+%Y%m%d")
1919

2020
echo ">>>new version: $new_version"
2121

‎.github/workflows/debug.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/explorer-device-java/unit_test_config.json.asc > explorer/explorer-device-java/src/test/resources/unit_test_config.json
3838
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/explorer-device-android/device.json.asc > explorer/device-android-demo/src/main/assets/device.json
3939
cp -r explorer/explorer-media-common/src/main/java/* explorer/explorer-device-rtc/src/main/java/
40-
cp -r explorer/explorer-media-common/src/main/java/* explorer/explorer-device-video/src/main/java/
40+
cp -r explorer/explorer-media-common/src/main/java/* video/video-advanced-device-android/src/main/java/
4141
sed -i '/explorer-media-common/, +d' explorer/explorer-device-rtc/build.gradle
42-
sed -i '/explorer-media-common/, +d' explorer/explorer-device-video/build.gradle
42+
sed -i '/explorer-media-common/, +d' video/video-advanced-device-android/build.gradle
4343
sh .github/scripts/updateValuesForTme.sh
4444
env:
4545
GIT_ACCESS_TOKEN: ${{ secrets.IOT_GITHUB_ACCESS_TOKEN }}
@@ -85,10 +85,10 @@ jobs:
8585
run: ./gradlew publish
8686
- name: Build Demo App
8787
run: |
88-
rm -rf explorer/explorer-device-video/src/main/java/com/tencent/iot/explorer/device/common/stateflow/*
88+
rm -rf video/video-advanced-device-android/src/main/java/com/tencent/iot/explorer/device/common/stateflow/*
8989
rm -rf explorer/explorer-device-rtc/src/main/java/com/tencent/iot/explorer/device/common/stateflow/*
9090
sed -i 's#//xxx##g' explorer/explorer-device-rtc/build.gradle
91-
sed -i 's#//xxx##g' explorer/explorer-device-video/build.gradle
91+
sed -i 's#//xxx##g' video/video-advanced-device-android/build.gradle
9292
./gradlew :explorer:device-android-demo:build
9393
- name: Archive the apks
9494
uses: actions/upload-artifact@v2

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/explorer-device-java/unit_test_config.json.asc > explorer/explorer-device-java/src/test/resources/unit_test_config.json
2626
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/sdk/secring.gpg.asc > secring.gpg
2727
cp -r explorer/explorer-media-common/src/main/java/* explorer/explorer-device-rtc/src/main/java/
28-
cp -r explorer/explorer-media-common/src/main/java/* explorer/explorer-device-video/src/main/java/
28+
cp -r explorer/explorer-media-common/src/main/java/* video/video-advanced-device-android/src/main/java/
2929
sed -i '/explorer-media-common/, +d' explorer/explorer-device-rtc/build.gradle
30-
sed -i '/explorer-media-common/, +d' explorer/explorer-device-video/build.gradle
30+
sed -i '/explorer-media-common/, +d' video/video-advanced-device-android/build.gradle
3131
sh .github/scripts/updateValuesForTme.sh
3232
env:
3333
GIT_ACCESS_TOKEN: ${{ secrets.IOT_GITHUB_ACCESS_TOKEN }}
@@ -88,10 +88,10 @@ jobs:
8888
run: ./gradlew publish
8989
- name: Build Demo App
9090
run: |
91-
rm -rf explorer/explorer-device-video/src/main/java/com/tencent/iot/explorer/device/common/stateflow/*
91+
rm -rf video/video-advanced-device-android/src/main/java/com/tencent/iot/explorer/device/common/stateflow/*
9292
rm -rf explorer/explorer-device-rtc/src/main/java/com/tencent/iot/explorer/device/common/stateflow/*
9393
sed -i 's#//xxx##g' explorer/explorer-device-rtc/build.gradle
94-
sed -i 's#//xxx##g' explorer/explorer-device-video/build.gradle
94+
sed -i 's#//xxx##g' video/video-advanced-device-android/build.gradle
9595
./gradlew :explorer:device-android-demo:build
9696
# - name: Archive the apks
9797
# uses: actions/upload-artifact@v2

‎explorer/device-android-demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ dependencies {
102102
implementation project(':explorer:explorer-device-face')
103103
implementation project(':explorer:explorer-device-rtc')
104104
implementation project(':explorer:explorer-device-central')
105-
api project(':explorer:explorer-device-video')
105+
api project(':video:video-advanced-device-android')
106106
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
107107
implementation 'androidx.recyclerview:recyclerview:1.2.0'
108108
testImplementation 'junit:junit:4.13'

‎explorer/device-android-demo/src/main/assets/watch.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"1.0","profile":{"ProductId":"E9ZCIEFE6G","CategoryId":"567"},"properties":[{"id":"_sys_xp2p_info","name":"xp2p信息","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"64"},"required":false},{"id":"_sys_cs_days","name":"云存全时天数","desc":"","mode":"rw","define":{"type":"int","min":"0","max":"100","start":"0","step":"1","unit":""},"required":false},{"id":"_sys_cs_status","name":"云存开关","desc":"","mode":"rw","define":{"type":"bool","mapping":{"0":"关","1":"开"}},"required":false},{"id":"_sys_cs_type","name":"云存类型","desc":"","mode":"rw","define":{"type":"enum","mapping":{"1":"全时","2":"事件"}},"required":false},{"id":"_sys_ai_status","name":"AI开关","desc":"","mode":"rw","define":{"type":"bool","mapping":{"0":"关","1":"开"}},"required":false},{"id":"_sys_video_call_status","name":"视频呼叫","desc":"","mode":"rw","define":{"type":"enum","mapping":{"0":"空闲或拒绝","1":"呼叫中","2":"通话中"}},"required":false},{"id":"_sys_userid","name":"呼叫的手机用户","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"2048"},"required":false},{"id":"_sys_call_userlist","name":"呼叫的用户列表","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"2048"},"required":false},{"id":"_sys_user_agent","name":"用户代理","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"2048"},"required":false},{"id":"_sys_extra_info","name":"额外信息","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"2048"},"required":false},{"id":"_sys_audio_call_status","name":"语音呼叫","desc":"","mode":"rw","define":{"type":"enum","mapping":{"0":"空闲或拒绝","1":"呼叫中","2":"通话中"}},"required":false},{"id":"_sys_caller_id","name":"主呼叫方id","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"2048"},"required":false},{"id":"_sys_called_id","name":"被呼叫方id","desc":"","mode":"rw","define":{"type":"string","min":"0","max":"2048"},"required":false},{"id":"record_enable","name":"本地录像使能","desc":"","mode":"rw","define":{"type":"bool","mapping":{"0":"关","1":"开"}},"required":false}],"events":[],"actions":[{"id":"trtc_join_room","name":"呼叫设备","desc":"","input":[{"id":"SdkAppId","name":"SdkAppId","define":{"type":"int","min":"0","max":"4300000000","start":"0","step":"1","unit":""}},{"id":"UserId","name":"UserId","define":{"type":"string","min":"0","max":"128"}},{"id":"UserSig","name":"UserSig","define":{"type":"string","min":"0","max":"256"}},{"id":"StrRoomId","name":"StrRoomId","define":{"type":"string","min":"0","max":"2048"}},{"id":"PrivateMapKey","name":"PrivateMapKey","define":{"type":"string","min":"0","max":"2048"}}],"output":[{"id":"Code","name":"Code","define":{"type":"int","min":"-100","max":"100","start":"0","step":"1","unit":""}}],"required":false}]}

‎explorer/device-android-demo/src/main/java/com/tencent/iot/explorer/device/rtc/ui/videocall/videolayout/TRTCVideoLayoutManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class TRTCVideoLayoutManager extends RelativeLayout {
4242

4343
public static final int MODE_FLOAT = 1; // 前后堆叠模式
4444
public static final int MODE_GRID = 2; // 九宫格模式
45-
public static final int MAX_USER = 9;
45+
public static final int MAX_USER = 1;
4646

4747
private LinkedList<TRTCLayoutEntity> mLayoutEntityList;
4848
private ArrayList<LayoutParams> mFloatParamList;

‎explorer/device-android-demo/src/main/java/com/tencent/iot/explorer/device/rtc/ui/videocall/videolayout/Utils.java

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,31 @@ public static ArrayList<RelativeLayout.LayoutParams> initFloatParamList(Context
2727
// 底部最大的布局
2828
RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
2929
list.add(layoutParams0);
30+
//右下角布局
31+
RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(Utils.dip2px(context, 100), Utils.dip2px(context, 100));
32+
layoutParams1.leftMargin = layoutWidth - Utils.dip2px(context, 105);
33+
layoutParams1.topMargin = layoutHeight - Utils.dip2px(context, 105);
34+
list.add(layoutParams1);
3035

31-
final int midMargin = Utils.dip2px(context, 10);
32-
final int lrMargin = Utils.dip2px(context, 15);
33-
final int bottomMargin = Utils.dip2px(context, 50);
34-
final int subWidth = Utils.dip2px(context, 120);
35-
final int subHeight = Utils.dip2px(context, 180);
36-
37-
for (int i = 2; i >= 0; i--) {
38-
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
39-
layoutParams.leftMargin = layoutWidth - lrMargin - subWidth;
40-
layoutParams.topMargin = layoutHeight - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
41-
list.add(layoutParams);
42-
}
43-
44-
for (int i = 2; i >= 0; i--) {
45-
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
46-
layoutParams.leftMargin = lrMargin;
47-
layoutParams.topMargin = layoutHeight - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
48-
list.add(layoutParams);
49-
}
36+
// final int midMargin = Utils.dip2px(context, 10);
37+
// final int lrMargin = Utils.dip2px(context, 15);
38+
// final int bottomMargin = Utils.dip2px(context, 50);
39+
// final int subWidth = Utils.dip2px(context, 120);
40+
// final int subHeight = Utils.dip2px(context, 180);
41+
//
42+
// for (int i = 2; i >= 0; i--) {
43+
// RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
44+
// layoutParams.leftMargin = layoutWidth - lrMargin - subWidth;
45+
// layoutParams.topMargin = layoutHeight - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
46+
// list.add(layoutParams);
47+
// }
48+
//
49+
// for (int i = 2; i >= 0; i--) {
50+
// RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
51+
// layoutParams.leftMargin = lrMargin;
52+
// layoutParams.topMargin = layoutHeight - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
53+
// list.add(layoutParams);
54+
// }
5055
return list;
5156
}
5257

0 commit comments

Comments
 (0)