yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'net_error'

Browse Source
This commit is contained in:
18401019693 2023-03-15 18:11:49 +08:00
commit db834caf00
42 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java
View File

@ -15,6 +15,7 @@ import com.yunbao.common.bean.AnchorRecommendItemModel;
import com.yunbao.common.bean.AnchorRecommendModel;
import com.yunbao.common.bean.CustomSidebarInfoModel;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.DrawerRecommendViewHolder;
import com.yunbao.common.views.DrawerTaskViewHolder;
import com.yunbao.common.views.FunGamesViewHolder;
@ -121,6 +122,7 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
}
});
}

3
common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
View File

@ -5,6 +5,7 @@ import android.os.Looper;
import android.util.Log;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.R;
import com.yunbao.common.bean.RankPkInfoBean;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
@ -341,7 +342,7 @@ public class RandomPkManager {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
}
});
}

2
common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java
View File

@ -164,7 +164,7 @@ public class CustomDrawerPopupView extends DrawerPopupView {
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show(R.string.net_error);
}
});
}

2
common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java
View File

@ -100,7 +100,7 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});
} else {

2
common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java
View File

@ -68,7 +68,7 @@ public class LiveAnchorMessageCustomPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});

2
common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java
View File

@ -142,7 +142,7 @@ public class LiveOpenCustomPopup extends CenterPopupView {
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});

2
common/src/main/java/com/yunbao/common/views/LiveRobotMessageCustomPopup.java
View File

@ -181,7 +181,7 @@ public class LiveRobotMessageCustomPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
common/src/main/java/com/yunbao/common/views/LiveRobotSayHelloCustomPopup.java
View File

@ -121,7 +121,7 @@ public class LiveRobotSayHelloCustomPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
common/src/main/java/com/yunbao/common/views/LiveRobotSettingCustomPopup.java
View File

@ -251,7 +251,7 @@ public class LiveRobotSettingCustomPopup extends BottomPopupView implements View
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});

2
common/src/main/java/com/yunbao/common/views/RobotMessageViewHolder.java
View File

@ -44,7 +44,7 @@ public class RobotMessageViewHolder extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});
}

2
common/src/main/java/com/yunbao/common/views/RobotSayHelloViewHoler.java
View File

@ -44,7 +44,7 @@ public class RobotSayHelloViewHoler extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});
}

1
common/src/main/res/values-en/strings.xml
View File

@ -1020,4 +1020,5 @@ Limited ride And limited avatar frame</string>
<string name="live_data_fan_group_rate">Fan group conversion rate</string>
<string name="live_data_loading">loading…</string>
<string name="yoursystemisolder">Gift and seat effects have been turned off and can be turned on manually in "Settings".</string>
<string name="net_error">i \'m sorry! An error occurred.</string>
</resources>

1
common/src/main/res/values/strings.xml
View File

@ -1041,4 +1041,5 @@
<string name="live_data_fan_group_rate">粉絲團轉化率</string>
<string name="live_data_loading">加载中…</string>
<string name="yoursystemisolder">由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。</string>
<string name="net_error">抱歉！出錯了！</string>
</resources>

1
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -1288,6 +1288,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
@Override
public void onError(String error) {
Log.e("LiveUserMoreDialog", error);
ToastUtil.show( R.string.net_error);
}
});
} else {

1
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -1358,6 +1358,7 @@ public class LiveAudienceActivity extends LiveActivity {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
}
});

2
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@ -1681,7 +1681,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show(R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/adapter/FreePkRecyclerAdapter.java
View File

@ -163,7 +163,7 @@ public class FreePkRecyclerAdapter extends RefreshAdapter<RandomPkUserBean> {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
}
});
});

3
live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java
View File

@ -26,6 +26,7 @@ import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.live.R;
import com.yunbao.live.adapter.FreePkRecyclerAdapter;
@ -170,7 +171,7 @@ public class FreePkDialogFragment extends AbsDialogFragment implements View.OnCl
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.common.R.string.net_error);
}
});
}

3
live/src/main/java/com/yunbao/live/dialog/LiveDataInfoDialog.java
View File

@ -10,6 +10,7 @@ import com.lxj.xpopup.XPopup;
import com.yunbao.common.dialog.AbsDialogPopupWindow;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.adapter.LiveDataInfoRecyclerAdapter;
@ -88,7 +89,7 @@ public class LiveDataInfoDialog extends AbsDialogPopupWindow {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.common.R.string.net_error);
}
});

2
live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java
View File

@ -202,7 +202,7 @@ public class LiveGameDialogFragment extends AbsDialogFragment {
@Override
public void onError(String error) {
Log.i("debug", "onError: " + error);
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
dismiss();
}
});

1
live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java
View File

@ -367,6 +367,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java
View File

@ -260,7 +260,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
View File

@ -27,6 +27,7 @@ import com.yunbao.common.dialog.AbsDialogPopupWindow;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.adapter.LiveTaskRecyclerAdapter;
@ -173,6 +174,7 @@ public class LiveTaskDialog extends AbsDialogPopupWindow {
if (loadDialog != null) {
loadDialog.dismiss();
}
ToastUtil.show(R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
View File

@ -19,6 +19,7 @@ import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.adapter.FunGamesAdapter;
import com.yunbao.live.event.LiveAudienceEvent;
@ -92,6 +93,7 @@ public class LiveTotalDialog extends AbsDialogFragment {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
} else {

2
live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java
View File

@ -194,7 +194,7 @@ public class RandomPkDialogFragment extends AbsDialogFragment implements View.On
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@ -1689,7 +1689,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});

2
live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
View File

@ -29,6 +29,7 @@ import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.common.views.weight.ClipPathCircleImage;
import com.yunbao.live.R;
@ -131,6 +132,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@ -356,7 +356,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});

3
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -102,6 +102,7 @@ import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ScreenDimenUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.formatBigNum;
import com.yunbao.common.views.AbsViewHolder;
@ -1824,7 +1825,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});

1
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -348,6 +348,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
@Override
public void onError(String error) {
Log.e("PortraitLiveManager", error);
ToastUtil.show( R.string.net_error);
}
});
}

2
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -626,7 +626,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show(R.string.net_error);
//直播间上部轮播【新人特惠】【趣味游戏】【幸运天使】 轮播接口
mLiveRoomViewHolder.showLiveRoomActivityBanner();
}

2
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -275,7 +275,7 @@ public class EntryActivity extends AppCompatActivity {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});

1
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -541,6 +541,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
}
});

2
main/src/main/java/com/yunbao/main/activity/MainListActivity.java
View File

@ -176,7 +176,7 @@ public class MainListActivity extends AbsActivity implements OnItemClickListener
@Override
public void onError(String error) {
Log.e("MainListActivity", error);
ToastUtil.show( R.string.net_error);
}
});
initView();

2
main/src/main/java/com/yunbao/main/activity/MsgSettActivity.java
View File

@ -239,7 +239,7 @@ public class MsgSettActivity extends AbsActivity {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
}
});
}

2
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@ -443,7 +443,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
@Override
public void onError(String error) {
ToastUtil.show(error);
ToastUtil.show( R.string.net_error);
}
});
MessageIMManager.get(mContext).setSystemNumber(0);

3
main/src/main/java/com/yunbao/main/adapter/MsgFollowAdapter.java
View File

@ -21,6 +21,7 @@ import com.yunbao.common.http.ResponseData;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.main.R;
@ -113,7 +114,7 @@ public class MsgFollowAdapter extends RecyclerView.Adapter<MsgFollowAdapter.Vh>
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

1
main/src/main/java/com/yunbao/main/adapter/SearchResultsAdapter.java
View File

@ -61,6 +61,7 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
}
});
}

1
main/src/main/java/com/yunbao/main/fragment/SearchRecommendFragment.java
View File

@ -85,6 +85,7 @@ public class SearchRecommendFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

2
main/src/main/java/com/yunbao/main/fragment/SearchResultsItemFragment.java
View File

@ -16,6 +16,7 @@ import com.yunbao.common.bean.SearchModel;
import com.yunbao.common.fragment.BaseFragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.OnRecyclerViewScrollListener;
import com.yunbao.main.R;
import com.yunbao.main.adapter.SearchRecommendBodyAdapter;
@ -116,6 +117,7 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}

3
main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
View File

@ -20,6 +20,7 @@ import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.manager.InstructorRemarkManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.activity.PDLIiveChatActivity;
import com.yunbao.live.activity.PDLiveConversationActivity;
import com.yunbao.live.bean.SearchUserBean;
@ -317,7 +318,7 @@ public class ConversationIMListManager {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
}
});
}

1
main/src/main/java/com/yunbao/main/views/SearchRecommendBodyViewHolder.java
View File

@ -53,6 +53,7 @@ public class SearchRecommendBodyViewHolder extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
}
});
}