Przeglądaj źródła

1.修改部分逻辑问题

FailedToRead 3 lat temu
rodzic
commit
d07790cb43

+ 1 - 1
app/src/main/java/com/edufound/reader/adapter/SlideVideoAdapter.java

@@ -63,7 +63,7 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
 //        holder.mVideo.setUp(new JZDataSource(mListData.get(position).getUserRead().getVideoPath()), JzvdStd.SCREEN_FULLSCREEN);
         holder.mVideo.setUp(new JZDataSource(mListData.get(position).getUserRead().getVideoPath()), JzvdStd.SCREEN_FULLSCREEN, JZMediaIjk.class, mListData.get(position).getUserRead().getId());
         GlideUtils.loadImageSizeKipMemoryCache(mContext, mListData.get(position).getUserRead().getCoverImg(), holder.mVideo.posterImageView);
-        holder.initDanMu(mListData.get(position).getUserRead().getId());
+//        holder.initDanMu(mListData.get(position).getUserRead().getId());
         holder.mVideo.startPreloading();
         holder.mSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override

+ 7 - 0
app/src/main/java/com/edufound/reader/apiserver/OrderApiServerImpl.java

@@ -33,6 +33,11 @@ public class OrderApiServerImpl implements OrderApiServer {
     }
 
     @Override
+    public void getAuth(Callback callback) {
+        OkHttpClient.doGetAsync(new HttpInfo.Builder().setUrl(API + "/auth"), callback);
+    }
+
+    @Override
     public void getAuth(Activity activity, Callback callback) {
         OkHttpClient.doGetAsync(activity, new HttpInfo.Builder().setUrl(API + "/auth"), callback);
     }
@@ -48,4 +53,6 @@ interface OrderApiServer {
     void getProductListInfo(Activity activity, String channel, Callback callback);
 
     void createdOrder(Activity activity, String json, Callback callback);
+
+    void getAuth(Callback callback);
 }

+ 5 - 0
app/src/main/java/com/edufound/reader/base/BaseActivity.java

@@ -833,4 +833,9 @@ public abstract class BaseActivity extends AppCompatActivity {
     //endregion
 
 
+
+
+
+
+
 }

+ 3 - 0
app/src/main/java/com/edufound/reader/contract/RecommendFragmentContract.java

@@ -1,6 +1,7 @@
 package com.edufound.reader.contract;
 
 import android.app.Activity;
+import android.widget.ImageView;
 
 import com.edufound.reader.base.BaseView;
 import com.edufound.reader.bean.UserRecordBean;
@@ -45,6 +46,8 @@ public interface RecommendFragmentContract {
 
         void showFirstIntoView();
 
+        ImageView getisViewUI();
+
     }
 
     interface Presenter {

+ 6 - 16
app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -205,22 +205,7 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
     @Override
     public void onResume() {
         mPresenter.fragmentResume(mRecyclerView);
-        if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
-            if (Consts.getmConstsBaiDuUserBean() != null) {
-                isUserVip.setVisibility(View.INVISIBLE);
-            }
-        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode()) || Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
-            isUserVip.setEnabled(false);
-            isUserVip.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (Consts.isIsYFVip()) {
-                        isUserVip.setVisibility(View.INVISIBLE);
-                    }
-                    isUserVip.setEnabled(true);
-                }
-            }, 500);
-        }
+
         super.onResume();
 
     }
@@ -363,6 +348,11 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         }
     }
 
+    @Override
+    public ImageView getisViewUI() {
+        return isUserVip;
+    }
+
 
     @Override
     public void onDestroy() {

+ 3 - 3
app/src/main/java/com/edufound/reader/presenter/MyTabFragmentPresenter.java

@@ -313,13 +313,13 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
                 mView.setUserInfo(bean.getData());
                 getMyRecords();
                 getCheckNum();
+                Logger.e("获取我的信息:" + info.getRetDetail());
             }
 
             @Override
             public void onFailure(HttpInfo info) throws IOException {
-                if (info.getRetCode() == 6) {
-                    getMyInfo();
-                }
+                Logger.e("获取我的信息失败:" + info.getRetDetail());
+                getMyInfo();
             }
         });
     }

+ 26 - 1
app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java

@@ -13,6 +13,7 @@ import com.edufound.reader.adapter.SlideVideoAdapter;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.base.BaseActivity;
 import com.edufound.reader.base.BasePresenter;
+import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.bean.FavoritesBean;
 import com.edufound.reader.bean.HttpResultBean;
 import com.edufound.reader.bean.HttpResultDataListBean;
@@ -43,6 +44,7 @@ import java.util.Map;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;
+
 import cn.jzvd.Jzvd;
 import cn.jzvd.JzvdStd;
 
@@ -142,6 +144,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             public void onInitComplete() {
                 //自动播放第一条
                 autoPlayVideo(rv);
+                fragmentResume(rv);
             }
 
             @Override
@@ -149,6 +152,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                 if (mCurrentPosition == position) {
                     Jzvd.releaseAllVideos();
                 }
+                checkIsVip();
             }
 
             @Override
@@ -157,6 +161,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
 //                    Logger.e("mCurrentPosition == position..return了");
 //                    return;
 //                }
+
                 ((BaseActivity) mView.getActivity()).removeFirstTipView();
                 autoPlayVideo(rv);
                 mCurrentPosition = position;
@@ -208,7 +213,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
 
     @Override
     public void fragmentResume(RecyclerView rv) {
-
+        checkIsVip();
         mView.getRootView().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -223,6 +228,26 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
         }, 800);
     }
 
+
+    public void checkIsVip() {
+        if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+            if (Consts.getmConstsBaiDuUserBean() != null) {
+                mView.getisViewUI().setVisibility(View.INVISIBLE);
+            }
+        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode()) || Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
+            mView.getisViewUI().setEnabled(false);
+            mView.getisViewUI().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (Consts.isIsYFVip()) {
+                        mView.getisViewUI().setVisibility(View.INVISIBLE);
+                    }
+                    mView.getisViewUI().setEnabled(true);
+                }
+            }, 500);
+        }
+    }
+
     @Override
     public void getRecommendDataList() {
         if (mDataList != null && mDataList.size() >= mTotalSize) {

+ 1 - 1
app/src/main/java/com/edufound/reader/presenter/SmallFullVideoPresenter.java

@@ -66,6 +66,6 @@ public class SmallFullVideoPresenter extends BasePresenter<SmallFullVideoContrac
                 mView.getActivity().finish();
                 break;
         }
-        return true;
+        return false;
     }
 }

+ 1 - 1
app/src/main/java/com/edufound/reader/tmailsdk/TMailConstants.java

@@ -1,5 +1,5 @@
 package com.edufound.reader.tmailsdk;
 
 public class TMailConstants {
-    public static String appSecret = "9e8fca6f-37bd-4b90-8e10-1da4a681b5fe";
+    public static String appSecret = "bd223dca-3253-4582-83af-9bc63450723f";
 }

+ 25 - 3
app/src/main/java/com/edufound/reader/tmailsdk/TMailSDKUtil.java

@@ -14,6 +14,7 @@ import com.alibaba.ailabs.genie.authservice.api.IRequestPermissionListener;
 import com.alibaba.ailabs.genie.authservice.api.IRequestPermissions;
 import com.alibaba.genie.waft.gcs.rpc.GenieServiceLoader;
 import com.edufound.reader.activity.LoginAlertActivity;
+import com.edufound.reader.apiserver.OrderApiServerImpl;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.bean.HttpResultBean;
 import com.edufound.reader.bean.UserBean;
@@ -43,6 +44,7 @@ import java.util.Map;
 public class TMailSDKUtil {
 
     public static void TMailLogin(Context context) {
+        Logger.e("调用天猫登录放大----TMailLogin");
         UserApiServerImpl mUserApi = new UserApiServerImpl();
         String genieAppType = "NATIVE";
         String genieAppIdentifier = TMailConstants.appSecret;
@@ -50,8 +52,7 @@ public class TMailSDKUtil {
         permissions.add("profile:phone_number:read");
 //        //Step1 获取授权服务的RPC引用 -- 注意如果此时方法返回null,说明系统中没有授权服务模块,请升级系统版本
         IRequestPermissions requestPermissions = GenieServiceLoader.load(IRequestPermissions.class);
-//
-//
+        Logger.e("requestPermissions==null???---" + (requestPermissions == null));
         if (requestPermissions == null) {
             Logger.e("没有授权服务模块,请升级系统版本");
             return;
@@ -59,9 +60,9 @@ public class TMailSDKUtil {
         //Step2 调用查询授权接口
         AuthProtocolParameters authProtocolParameters = new AuthProtocolParameters(genieAppType, genieAppIdentifier, permissions);
         if (requestPermissions != null) {
+            Logger.e("不是空的,调用了");
             try {
                 requestPermissions.requestPermissions(authProtocolParameters, new IRequestPermissionListener() {
-
                     @Override
                     public void authServiceResponse(AuthResponse authResponse) {
                         Logger.e(" authResponse = " + authResponse);
@@ -92,6 +93,22 @@ public class TMailSDKUtil {
                                     Consts.setmConstsUserBean(bean.getData());
                                     Consts.setUID(bean.getData().getUid());
                                     Toast.makeText(context, "登录成功", Toast.LENGTH_SHORT).show();
+                                    OrderApiServerImpl orderApiServer = new OrderApiServerImpl();
+                                    orderApiServer.getAuth(new Callback() {
+                                        @Override
+                                        public void onSuccess(HttpInfo info) throws IOException {
+                                            HttpResultBean<String> bean = info.getRetDetail(new TypeToken<HttpResultBean<String>>() {
+                                            }.getType());
+                                            Logger.e("    info.getRetDetail():" + info.getRetDetail());
+                                            Logger.e("bean.getData():" + bean.getData());
+                                            Consts.setIsYFVip(true);
+                                        }
+
+                                        @Override
+                                        public void onFailure(HttpInfo info) throws IOException {
+
+                                        }
+                                    });
                                 }
 
                                 @Override
@@ -106,11 +123,16 @@ public class TMailSDKUtil {
                             context.startActivity(tologin);
                         }
                     }
+
+
                 });
 
             } catch (Exception e) {
                 e.printStackTrace();
+                Logger.e("不是空的,但是异常了=" + e.getMessage());
             }
+        } else {
+            Logger.e("空的,别调用了");
         }
 
         Intent intent = new Intent();

+ 2 - 0
app/src/main/java/com/edufound/reader/util/EfunboxUtil.java

@@ -12,6 +12,7 @@ import com.edufound.reader.activity.TmailPayActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.botsdk.BotRegisterListener;
 import com.edufound.reader.tmailsdk.TMailSDKUtil;
+import com.orhanobut.logger.Logger;
 
 import java.text.DecimalFormat;
 
@@ -148,6 +149,7 @@ public class EfunboxUtil {
     }
 
     public static void userLogin(Context context) {
+        Logger.e("调用登录方法--Consts.getUmengChannel():" + Consts.getUmengChannel());
         if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
             //百度渠道调用百度的授权
             BotRegisterListener.getBaiDuVipInfo();