diff --git a/common/build.gradle b/common/build.gradle index 39057acfc..09d7dd30a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -116,8 +116,8 @@ dependencies { api rootProject.ext.dependencies["ucrop"] //腾讯定位,地图sdk - api files('libs/TencentLocationSdk_v6.2.5.3.jar') - api files('libs/TencentMapSDK_1.2.8.1.jar') +// api files('libs/TencentLocationSdk_v6.2.5.3.jar') +// api files('libs/TencentMapSDK_1.2.8.1.jar') //下拉刷新上拉加载 api rootProject.ext.dependencies["smartRefreshLayout"] diff --git a/common/libs/TencentLocationSdk_v6.2.5.3.jar b/common/libs/TencentLocationSdk_v6.2.5.3.jar deleted file mode 100644 index 45341f9ab..000000000 Binary files a/common/libs/TencentLocationSdk_v6.2.5.3.jar and /dev/null differ diff --git a/common/libs/TencentMapSDK_1.2.8.1.jar b/common/libs/TencentMapSDK_1.2.8.1.jar deleted file mode 100644 index 11b4d7b3b..000000000 Binary files a/common/libs/TencentMapSDK_1.2.8.1.jar and /dev/null differ diff --git a/config.gradle b/config.gradle index d5aed2da0..b74e191c8 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 5f32fae2e..1be8185f3 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -83,6 +83,7 @@ import com.yunbao.live.dialog.BlowkissDialog; import com.yunbao.live.dialog.NewUserDialog; import com.yunbao.live.event.LinkMicTxAccEvent; import com.yunbao.live.event.LiveAudienceEvent; +import com.yunbao.live.event.LiveGiftDialogEvent; import com.yunbao.live.event.LiveRoomChangeEvent; import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpUtil; @@ -1274,6 +1275,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveEndViewHolder = new LiveEndViewHolder(mContext, mSecondPage, mLiveBean.getUid()); mLiveEndViewHolder.subscribeActivityLifeCycle(); mLiveEndViewHolder.addToParent(); + Bus.get().post(new LiveGiftDialogEvent()); } mLiveBean.setIsattention(isattention + ""); mLiveEndViewHolder.showData(mLiveBean, mLiveBean.getStream());