111

common/src/main/java/com/yunbao/common/http/HttpCallback.java

@@ -23,7 +23,7 @@ import java.net.UnknownServiceException;
 
 public abstract class HttpCallback extends AbsCallback<JsonBean> {
 
-    private Dialog mLoadingDialog;
+//    private Dialog mLoadingDialog;
 
     @Override
     public JsonBean convertResponse(okhttp3.Response response) throws Throwable {
@@ -62,9 +62,9 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
         if (t instanceof SocketTimeoutException || t instanceof ConnectException || t instanceof UnknownHostException || t instanceof UnknownServiceException || t instanceof SocketException) {
             ToastUtil.show(R.string.load_failure);
         }
-        if (showLoadingDialog() && mLoadingDialog != null) {
-            mLoadingDialog.dismiss();
-        }
+//        if (showLoadingDialog() && mLoadingDialog != null) {
+//            mLoadingDialog.dismiss();
+//        }
         onError();
     }
 
@@ -81,21 +81,21 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
     }
 
     public void onStart() {
-        if (showLoadingDialog()) {
-            if (mLoadingDialog == null) {
-                mLoadingDialog = createLoadingDialog();
-            }
-            try {
-                mLoadingDialog.show();
-            }catch (Exception e){e.printStackTrace();}
-        }
+//        if (showLoadingDialog()) {
+//            if (mLoadingDialog == null) {
+//                mLoadingDialog = createLoadingDialog();
+//            }
+//            try {
+//                mLoadingDialog.show();
+//            }catch (Exception e){e.printStackTrace();}
+//        }
     }
 
     @Override
     public void onFinish() {
-        if (showLoadingDialog() && mLoadingDialog != null) {
-            mLoadingDialog.dismiss();
-        }
+//        if (showLoadingDialog() && mLoadingDialog != null) {
+//            mLoadingDialog.dismiss();
+//        }
     }
 
     public Dialog createLoadingDialog() {

live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java

@@ -174,7 +174,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter<LiveGiftAdapter.Vh> {
         }
 
         void setData(LiveGiftBean bean, int position, Object payload) {
-            if( IMLoginManager.get(mContext).isNewUserGif()== false) {
+            if( IMLoginManager.get(mContext).isNewUserGif()== true) {
                 if (position == 0 && bean.getTag()!=null) {
                     mRadioButton.setBackgroundResource(R.mipmap.live_gift_light_bg);
                 }
@@ -193,7 +193,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter<LiveGiftAdapter.Vh> {
                 }
                 mPrice.setText(bean.getPrice());
 
-                if (IMLoginManager.get(mContext).isNewUserGif() == false && position == 0 && bean.getTag() != null) {
+                if (IMLoginManager.get(mContext).isNewUserGif() == true && position == 0 && bean.getTag() != null) {
                     mPayico.setVisibility(View.GONE);
                     mPrice.setText(R.string.free);
                     mPrice.setTextColor(Color.parseColor("#FFF269"));

live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java

@@ -427,12 +427,9 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
     }
 
     private void showGiftList(List<LiveGiftBean> list) {
-        if (IMLoginManager.get(mContext).isNewUserGif() == false && type_name.equals("熱門")|| type_name.equals("Hot")) {
-            ToastUtil.show(IMLoginManager.get(mContext).isNewUserGif() +"aaaa");
+        if (IMLoginManager.get(mContext).isNewUserGif() == true && type_name.equals("熱門")|| type_name.equals("Hot")) {
 
-            list.add(0, bean1);
             if(mWishGiftId==null) {
-                ToastUtil.show(12121+"");
 
                 mWishGiftId = "" + bean1.getId();
             }

live/src/main/java/com/yunbao/live/views/LiveContributeViewHolder.java

@@ -80,7 +80,6 @@ public class LiveContributeViewHolder extends AbsLivePageViewHolder implements V
         if (!mLoad) {
             mLoad = true;
             mWebView.loadUrl(HtmlConfig.LIVE_LIST + mLiveUid);
-            Log.e("ttt",HtmlConfig.LIVE_LIST + mLiveUid);
         } else {
             mWebView.reload();
         }

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -321,6 +321,7 @@ public class LoginActivity extends AbsActivity {
                                     MainActivity.forward(LoginActivity.this, false);
                                     gotoLive(obj.getString("anchor_id"));
                                     IMLoginManager.get(mContext).setisNewUserOne(true);
+                                    IMLoginManager.get(mContext).setNewUserGif(true);
                                     if (obj.containsKey("home_zdy_pop")) {
                                         NoviceInstructorManager.get(mContext).setHomeZdyPop(obj.getString("home_zdy_pop"));
                                     }