diff --git a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java
index b28a9f85a..3a095be5c 100644
--- a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java
@@ -26,7 +26,13 @@ public abstract class AbsViewHolder implements LifeCycleListener {
mTag = getClass().getSimpleName();
mContext = context;
mParentView = parentView;
- mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
+ try {
+ mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
+ }catch (Exception e){
+ L.e("AbsViewHolder",e.toString());
+ }
+ if (mContentView == null)
+ L.e("AbsViewHolder","mContentView==null");
init();
}
@@ -35,7 +41,13 @@ public abstract class AbsViewHolder implements LifeCycleListener {
processArguments(args);
mContext = context;
mParentView = parentView;
- mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
+ try {
+ mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
+ }catch (Exception e){
+ L.e("AbsViewHolder",e.toString());
+ }
+ if (mContentView == null)
+ L.e("AbsViewHolder","mContentView==null");
init();
}
diff --git a/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java b/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java
index 8fd5702fa..89d5922c3 100644
--- a/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java
@@ -19,7 +19,7 @@ import org.greenrobot.eventbus.EventBus;
public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.OnClickListener {
- public TextView mRedPoint;//消息上的红点
+ public View mRedPoint;//消息上的红点
public View mRedPointPrivilege;//皇冠上的点
public AbsLiveViewHolder(Context context, ViewGroup parentView) {
@@ -30,8 +30,8 @@ public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.On
public void init() {
findViewById(R.id.et_input).setOnClickListener(this);
findViewById(R.id.btn_msg).setOnClickListener(this);
- mRedPoint = (TextView) findViewById(R.id.red_point);
- mRedPointPrivilege = findViewById(R.id.privilege_red_point);
+ mRedPoint = findViewById(R.id.red_point);
+ //mRedPointPrivilege = findViewById(R.id.privilege_red_point);
}
diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
index 5bb08a201..0a957990a 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
@@ -92,8 +92,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
private ImageView giftImage, liveNewPeople;
private String newPeopleUrl = null;
private View mNewPeopleRedDot;
- private LinearLayout voiceButton;
- private ImageView mRole;//特权
+ private ImageView voiceButton;
+ // private ImageView mRole;//特权
private ImageView mPlay;//玩
private ImageView mCheat;//整蛊
private ImageView pd_pao, combo;
@@ -150,15 +150,15 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
// msgRedPoint = findViewById(R.id.msg_red_point);
// totalImage = findViewById(R.id.total_image);
// totalRedPoint = findViewById(R.id.total_red_point);
-
- voiceButton = (LinearLayout) findViewById(R.id.voice_button);
+ Log.i("LiveAudienceViewHolder", "init");
+ voiceButton = findViewById(R.id.voice_button);
giftImage = (ImageView) findViewById(R.id.gift_image);
quick_gift_remaining_quantity = (TextView) findViewById(R.id.quick_gift_remaining_quantity);
time_text = (TextView) findViewById(R.id.time_text);
liveNewPeople = (ImageView) findViewById(R.id.live_new_people);
viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper_banner);
- mRole = (ImageView) findViewById(R.id.live_privilege);
+
mCheat = (ImageView) findViewById(R.id.live_cheat);
mPlay = (ImageView) findViewById(R.id.live_play);
stationHornBanner = findViewById(R.id.station_horn_banner);
@@ -166,12 +166,13 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
pd_pao = (ImageView) findViewById(R.id.pd_pao);
combo = (ImageView) findViewById(R.id.combo);
circleProgress = (CircleProgress2) findViewById(R.id.circleProgress);
+ //mRole = (ImageView) findViewById(R.id.live_privilege);
combo.setVisibility(View.GONE);
liveNewPeople.setOnClickListener(this);
- mRole.setOnClickListener(this);
+ //mRole.setOnClickListener(this);
mCheat.setOnClickListener(this);
mPlay.setOnClickListener(this);
-
+ Log.i("LiveAudienceViewHolder", "init2");
findViewById(R.id.btn_mic).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -206,7 +207,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
});
findViewById(R.id.btn_more).setOnClickListener(this);
-
+ Log.i("LiveAudienceViewHolder", "init3");
v_msg_redpoint = (View) findViewById(R.id.v_msg_redpoint);
//底部改造
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.total_image), new ViewClicksAntiShake.ViewClicksCallBack() {
@@ -240,6 +241,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
}
});
+ Log.i("LiveAudienceViewHolder", "init4");
// //底部礼物弹窗
ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
@@ -258,7 +260,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_role : R.mipmap.live_icon_role_en, mRole);
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_play : R.mipmap.live_icon_play_en, mPlay);
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_cheat : R.mipmap.live_icon_cheat_en, mCheat);
-
+ Log.i("LiveAudienceViewHolder", "init5");
voiceButton.setOnTouchListener((v, event) -> {
MobclickAgent.onEvent(mContext, "live_room_voice_chat_btn", "直播间点开最下面的语音输入的聊天按钮");
if (event.getAction() == MotionEvent.ACTION_DOWN) {
@@ -310,6 +312,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
}
return true;
});
+ Log.i("LiveAudienceViewHolder", "init6");
mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
quick_gift_remaining_quantity.setVisibility(View.GONE);
time_text.setVisibility(View.GONE);
@@ -372,6 +375,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
}
});
+ Log.i("LiveAudienceViewHolder", "init7");
combo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -407,6 +411,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
findViewById(R.id.total_image_red_point).setVisibility(View.GONE);
}
getMsgCount();
+ Log.i("LiveAudienceViewHolder", "init8");
}
private void getMsgCount() {
@@ -705,10 +710,12 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
openZGListWindow();
} else if (i == R.id.live_new_people) {
openNewPeopleDialog();
- } else if (i == R.id.live_privilege) {
- MobclickAgent.onEvent(mContext, "live_room_privilege", "直播间下面打开皇冠按钮");
- openRoleDialog();
- } else if (i == R.id.live_cheat) {
+ }
+// else if (i == R.id.live_privilege) {
+// MobclickAgent.onEvent(mContext, "live_room_privilege", "直播间下面打开皇冠按钮");
+// openRoleDialog();
+// }
+ else if (i == R.id.live_cheat) {
} else if (i == R.id.live_play) {
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 d2e572d22..24068bdc6 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -499,6 +499,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
enterRoomNew();
Bus.get().post(new LiveOpenSuccessEvent());
} catch (Exception e) {
+ Log.e("进入房间异常", e.toString());
e.printStackTrace();
}
}
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index d0daa7dc5..087cf0acc 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -114,20 +114,199 @@
-
+ tools:layout_marginBottom="45dp">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:gravity="center_vertical"
+ android:visibility="gone"
+ tools:visibility="visible">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -511,18 +495,6 @@
android:visibility="gone" />
-
diff --git a/live/src/main/res/layout/view_live_audience_part.xml b/live/src/main/res/layout/view_live_audience_part.xml
deleted file mode 100644
index b4ff81aa0..000000000
--- a/live/src/main/res/layout/view_live_audience_part.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/live/src/main/res/mipmap-hdpi/ic_live_new_voice.png b/live/src/main/res/mipmap-hdpi/ic_live_new_voice.png
new file mode 100644
index 000000000..360fea89a
Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_new_voice.png differ
diff --git a/live/src/main/res/mipmap-mdpi/ic_live_new_voice.png b/live/src/main/res/mipmap-mdpi/ic_live_new_voice.png
new file mode 100644
index 000000000..1c1acd418
Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_new_voice.png differ
diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png b/live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png
new file mode 100644
index 000000000..70b1e2be7
Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png differ
diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_new_voice.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_new_voice.png
new file mode 100644
index 000000000..9e55ad950
Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_new_voice.png differ