-
王雪伟 authored
# Conflicts: # app/src/main/java/com/ym/zxhcsdkaar/MainActivity.java # zxhcsdk/src/main/java/com/ym/zxhcsdk/ads/RewardvideoPortraitADActivity.java # zxhcsdk/src/main/java/com/ym/zxhcsdk/view/ZXHCRewardVideoAD.java
d0f21318
# Conflicts: # app/src/main/java/com/ym/zxhcsdkaar/MainActivity.java # zxhcsdk/src/main/java/com/ym/zxhcsdk/ads/RewardvideoPortraitADActivity.java # zxhcsdk/src/main/java/com/ym/zxhcsdk/view/ZXHCRewardVideoAD.java