فهرست منبع

1.修改部分界面细节问题
2.修改基础版本进入时卡住问题
3.修改进入时推荐报错导致卡住问题

FailedToRead 3 سال پیش
والد
کامیت
1e3f645a54
28فایلهای تغییر یافته به همراه377 افزوده شده و 73 حذف شده
  1. 7 3
      .idea/misc.xml
  2. 11 3
      app/build.gradle
  3. 6 0
      app/src/activityLoginAlert/drawable/activity_saffloer_window_item_divier.xml
  4. 13 0
      app/src/fragmentUser/layout/popupwindow_bind_wechat.xml
  5. 3 1
      app/src/main/AndroidManifest.xml
  6. 2 2
      app/src/main/java/com/edufound/reader/activity/CommentActivity.java
  7. 2 0
      app/src/main/java/com/edufound/reader/activity/RecordActivity.java
  8. 11 0
      app/src/main/java/com/edufound/reader/apiserver/UserApiServerImpl.java
  9. 15 7
      app/src/main/java/com/edufound/reader/application/EApplication.java
  10. 8 0
      app/src/main/java/com/edufound/reader/base/BaseActivity.java
  11. 1 2
      app/src/main/java/com/edufound/reader/base/BaseFragment.java
  12. 7 2
      app/src/main/java/com/edufound/reader/bean/ChannelCodeEnum.java
  13. 150 0
      app/src/main/java/com/edufound/reader/bean/PlayLogBean.java
  14. 47 10
      app/src/main/java/com/edufound/reader/cusview/RvListJzvdStd.java
  15. 4 2
      app/src/main/java/com/edufound/reader/popwindow/PopWindowUtil.java
  16. 15 6
      app/src/main/java/com/edufound/reader/presenter/MainPresenter.java
  17. 5 2
      app/src/main/java/com/edufound/reader/presenter/MyTabFragmentPresenter.java
  18. 48 13
      app/src/main/java/com/edufound/reader/presenter/PopWindowPresneter.java
  19. 4 2
      app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java
  20. 5 0
      app/src/main/java/com/edufound/reader/presenter/RecordPresenter.java
  21. 1 1
      app/src/main/java/com/edufound/reader/presenter/SafflowerPresenter.java
  22. 3 1
      app/src/main/java/com/edufound/reader/receiver/BackPageReceiver.java
  23. 0 1
      app/src/main/java/com/edufound/reader/services/RecordServices.java
  24. 1 1
      app/src/main/java/com/edufound/reader/util/HttpInterceptor.java
  25. 1 7
      app/src/main/java/com/edufound/reader/util/OkHttpClient.java
  26. 0 0
      app/src/main/res/drawable/popupwindow_select_grade_selector.xml
  27. 5 5
      app/src/main/res/layout/activity_saffloer.xml
  28. 2 2
      app/src/main/res/layout/activity_saffloer_window_item.xml

+ 7 - 3
.idea/misc.xml

@@ -5,6 +5,7 @@
       <map>
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/activity_loginalert_check_selector.xml" value="0.3328125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/activity_record_start_anim.xml" value="0.5" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/activity_saffloer_window_item_divier.xml" value="0.4140625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/first_tip_bg.xml" value="0.361328125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/popup_record_status_over_start_divider.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/popup_window_bind_wechat_qrcode_bg.xml" value="0.5048828125" />
@@ -41,7 +42,7 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/adapter_item_record_authority.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/fragment_user_rv_bottom.xml" value="0.2771317829457364" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popup_window_bind_wechat.xml" value="0.25" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_bind_wechat.xml" value="0.5" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_bind_wechat.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_cancellation_account.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_exit_login.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade.xml" value="0.5" />
@@ -51,7 +52,9 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/activity_saffloer_task_divier.xml" value="0.4912109375" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.4912109375" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/popupwindow_select_grade_selector.xml" value="0.4443359375" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/activity_comment_item_divier.xml" value="0.4140625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/activity_saffloer_sigin_layout_divier.xml" value="0.4296875" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/activity_saffloer_task_divier.xml" value="0.4140625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/cusjzplayer_controller_seekbar.xml" value="0.2713541666666667" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/ic_launcher_background.xml" value="0.4931640625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_character_selector.xml" value="0.32421875" />
@@ -63,6 +66,7 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_recommend_selector.xml" value="0.32421875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/player_seekbar_list.xml" value="0.2713541666666667" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/popupwindow_select_grade_griditem_divder.xml" value="0.5048828125" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/popupwindow_select_grade_selector.xml" value="0.4140625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_alert_login.xml" value="0.22" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_comment.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_crash_dialog.xml" value="0.12" />
@@ -75,7 +79,7 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_record.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer.xml" value="0.2" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_sign_layout_item.xml" value="0.67" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_window_item.xml" value="0.6294277929155313" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_window_item.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_userinfo_setting.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_video.xml" value="0.18824087245139876" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_web.xml" value="0.2731143552311436" />
@@ -92,7 +96,7 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_slidevideo.xml" value="0.1" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/anim_getfollow.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/curjzplayer_controller.xml" value="0.16" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/cusjzplayer_controller.xml" value="0.9" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/cusjzplayer_controller.xml" value="0.6268980477223427" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/first_tip.xml" value="0.9" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/fragment_main_character.xml" value="0.18" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/fragment_main_recommend.xml" value="0.2" />

+ 11 - 3
app/build.gradle

@@ -70,7 +70,7 @@ android {
                     'src/fragmentRecommend',   //首页推荐
                     'src/fragmentUser',//首页我的
                     'src/activityLoginAlert',//登录弹窗
-                    'src/exception'//登录弹窗
+                    'src/exception'//异常弹窗
             ]
         }
     }
@@ -80,7 +80,7 @@ android {
         channel_efunbox {
             signingConfig signingConfigs.efunbox
             manifestPlaceholders = [
-                    appCode: "2006",
+                    appCode: "3006",
                     appIcon: "@drawable/icon",
             ]
         }
@@ -88,7 +88,15 @@ android {
         channel_baidu {
             signingConfig signingConfigs.efunbox
             manifestPlaceholders = [
-                    appCode: "2017",
+                    appCode: "3003",
+                    appIcon: "@drawable/icon",
+            ]
+        }
+        //百度(小度音响)
+        channel_tmail {
+            signingConfig signingConfigs.efunbox
+            manifestPlaceholders = [
+                    appCode: "3002",
                     appIcon: "@drawable/icon",
             ]
         }

+ 6 - 0
app/src/activityLoginAlert/drawable/activity_saffloer_window_item_divier.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/transparent" />
+    <size android:height="17dp" />
+</shape>

+ 13 - 0
app/src/fragmentUser/layout/popupwindow_bind_wechat.xml

@@ -55,6 +55,18 @@
                     android:layout_gravity="center"
                     android:background="@drawable/popup_window_bind_wechat_bg">
 
+
+                <TextView
+                        android:id="@+id/popupwindow_bind_wechat_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="150dp"
+                        android:layout_marginTop="100dp"
+                        android:text="微信昵称:xxxx"
+                        android:textSize="28dp"
+                        android:visibility="invisible"></TextView>
+
+
                 <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="44dp"
@@ -64,6 +76,7 @@
                         android:text="绑定微信"
                         android:textColor="@color/white"
                         android:textSize="30dp"></TextView>
+
             </FrameLayout>
 
             <FrameLayout

+ 3 - 1
app/src/main/AndroidManifest.xml

@@ -53,12 +53,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="com.edufound.reader.MAIN"></action>
+
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data
                         android:host="com.edufound.reader"
                         android:path="/main"
                         android:scheme="efunbox" />
             </intent-filter>
+
         </activity>
         <!-- 录音界面 -->
         <activity
@@ -220,7 +222,7 @@
         <!-- 友盟start -->
         <meta-data
                 android:name="UMENG_APPKEY"
-                android:value="5e34d2fb4ca3574b1800005b" />
+                android:value="61e7da42e0f9bb492bd8e12e" />
         <meta-data
                 android:name="UMENG_CHANNEL"
                 android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 友盟end -->

+ 2 - 2
app/src/main/java/com/edufound/reader/activity/CommentActivity.java

@@ -100,12 +100,12 @@ public class CommentActivity extends BaseMvpActivity<CommentPresenter> implement
                 //发送评论回复
 //                Toast.makeText(getActivity(), "发送评论回复", Toast.LENGTH_SHORT).show();
                 if (!TextUtils.isEmpty(mCommentEdit.getText().toString().trim())) {
-                    mPresenter.doReplyComment(mCommentEdit.getText().toString());
+                    mPresenter.doReplyComment(mCommentEdit.getText().toString().trim());
                 }
             } else {
 //                Toast.makeText(getActivity(), "发送评论", Toast.LENGTH_SHORT).show();
                 if (!TextUtils.isEmpty(mCommentEdit.getText().toString().trim())) {
-                    mPresenter.doPosts(mCommentEdit.getText().toString());
+                    mPresenter.doPosts(mCommentEdit.getText().toString().trim());
                 }
             }
         });

+ 2 - 0
app/src/main/java/com/edufound/reader/activity/RecordActivity.java

@@ -9,6 +9,7 @@ import android.graphics.drawable.AnimationDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -82,6 +83,7 @@ public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements
         mPresenter.createVideoPlayer();
         mPresenter.getReadInfo(getIntent());
         mJzVideoViwe.setCanPause(false);
+        mJzVideoViwe.setHideAllUI(true);
         addUiClickListener(mBack, o -> {
             if (mPresenter.getBackModel() == null || mPresenter.getBackModel().equals("") || mPresenter.getBackModel().equals("home")) {
                 mActivity.finish();

+ 11 - 0
app/src/main/java/com/edufound/reader/apiserver/UserApiServerImpl.java

@@ -96,6 +96,11 @@ public class UserApiServerImpl implements userApiServer {
     public void getSignInfo(Activity activity, Callback callback) {
         OkHttpClient.doGetAsync(activity, HttpInfo.Builder().setUrl(API + "/loginLog/signIn"), callback);
     }
+
+    @Override
+    public void getMyInfo(Activity activity, Callback callback) {
+        OkHttpClient.doGetAsync(activity, new HttpInfo.Builder().setUrl(API + "/user/my"), callback);
+    }
 }
 
 
@@ -151,4 +156,10 @@ interface userApiServer {
      */
     void getSignInfo(Activity activity, Callback callback);
 
+
+    /**
+     * 根据uid获取用户个人中心
+     */
+    void getMyInfo(Activity activity, Callback callback);
+
 }

+ 15 - 7
app/src/main/java/com/edufound/reader/application/EApplication.java

@@ -35,7 +35,9 @@ import com.orhanobut.logger.FormatStrategy;
 import com.orhanobut.logger.Logger;
 import com.orhanobut.logger.PrettyFormatStrategy;
 import com.tencent.mmkv.MMKV;
+import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
+import com.umeng.commonsdk.listener.OnGetOaidListener;
 
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -54,7 +56,7 @@ public class EApplication extends Application {
     public void onCreate() {
         super.onCreate();
         try {
-            Consts.setIsDebug(true);
+            Consts.setIsDebug(false);
             Consts.setmApplicAtion(this);
 
             //初始化异常监听
@@ -77,7 +79,15 @@ public class EApplication extends Application {
             Logger.addLogAdapter(new AndroidLogAdapter(formatStrategy));
             //初始化友盟
             UMConfigure.preInit(this, getUmengAppKey(), getUmengChannel());
-            UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "");
+            UMConfigure.init(this, getUmengAppKey(), getUmengChannel(), UMConfigure.DEVICE_TYPE_PHONE, "");
+            UMConfigure.getOaid(this, new OnGetOaidListener() {
+                @Override
+                public void onGetOaid(String s) {
+                    Logger.e("umeng_oaid:" + s);
+                }
+            });
+            MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
+
 //            UMConfigure.preInit(this,"");
             //初始化MMKV
             MMKV.initialize(this);
@@ -85,10 +95,7 @@ public class EApplication extends Application {
             if (DeviceUuidFactory.getUuid() == null) {
                 new DeviceUuidFactory(getApplicationContext());
             }
-            Logger.e("deviceUUID:" + DeviceUuidFactory.getUuid().toString());
-            if (Consts.isIsDebug()) {
-                Consts.setUID("test");
-            }
+            Consts.setUID("test");
             Logger.e("Consts.uid:" + Consts.getUID());
             //初始化activity监听
 //            registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
@@ -98,7 +105,7 @@ public class EApplication extends Application {
                 // 初始化BotSDK
                 BotSdk.getInstance().init(this);
                 // 打开BotSDK的Log开关,开发阶段建议打开Log开关,便于排查问题
-                BotSdk.enableLog(BuildConfig.DEBUG);
+//                BotSdk.enableLog(BuildConfig.DEBUG);
                 String random1 = BotConstants.RANDOM1_PREFIX + Math.random();
                 String random2 = BotConstants.RANDOM2_PREFIX + Math.random();
                 // 在线校验示例
@@ -116,6 +123,7 @@ public class EApplication extends Application {
 
     public static void killAppProcess(Context context) {
         //注意:不能先杀掉主进程,否则逻辑代码无法继续执行,需先杀掉相关进程最后杀掉主进程
+        MobclickAgent.onKillProcess(context.getApplicationContext());
         ActivityManager mActivityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         List<ActivityManager.RunningAppProcessInfo> mList = mActivityManager.getRunningAppProcesses();
         for (ActivityManager.RunningAppProcessInfo runningAppProcessInfo : mList) {

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

@@ -58,6 +58,8 @@ import com.jakewharton.rxbinding4.view.RxView;
 import com.okhttplib.HttpInfo;
 import com.okhttplib.callback.Callback;
 import com.orhanobut.logger.Logger;
+import com.umeng.analytics.MobclickAgent;
+import com.umeng.commonsdk.UMConfigure;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -577,6 +579,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                                         Consts.setmConstsUserBean(bean.getData());
                                         Logger.e("看看到底对没有:" + mGson.toJson(Consts.getmConstsUserBean()));
                                         refUserInfo(Consts.getmConstsUserBean());
+                                        Toast.makeText(topActivity, "注册登录成功", Toast.LENGTH_SHORT).show();
                                         userApiServer.loginSign(topActivity, new Callback() {
                                             @Override
                                             public void onSuccess(HttpInfo info) throws IOException {
@@ -679,6 +682,11 @@ public abstract class BaseActivity extends AppCompatActivity {
 //        }
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
     ShowFollowReceiver.ShowFollow showFollow = new ShowFollowReceiver.ShowFollow() {
         @Override
         public void showFollow(Intent intent) {

+ 1 - 2
app/src/main/java/com/edufound/reader/base/BaseFragment.java

@@ -248,16 +248,15 @@ public abstract class BaseFragment extends Fragment {
                                 userApiServer.registerUserId(topActivity, json, new Callback() {
                                     @Override
                                     public void onSuccess(HttpInfo info) throws IOException {
-
                                         HttpResultBean<UserBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserBean>>() {
                                         }.getType());
-
                                         Consts.setUID(bean.getData().getUid());
                                         //用户是否登录,登录了,创建Consts的userbean
                                         String nickName = EfunboxUtil.setPhoneMiddle(bean.getData().getMobile());
                                         bean.getData().setNickName(nickName);
                                         Consts.setmConstsUserBean(bean.getData());
                                         refUserInfo(Consts.getmConstsUserBean());
+                                        Toast.makeText(topActivity, "注册登录成功", Toast.LENGTH_SHORT).show();
                                         userApiServer.loginSign(topActivity, new Callback() {
                                             @Override
                                             public void onSuccess(HttpInfo info) throws IOException {

+ 7 - 2
app/src/main/java/com/edufound/reader/bean/ChannelCodeEnum.java

@@ -3,12 +3,17 @@ package com.edufound.reader.bean;
 public enum ChannelCodeEnum {
     YIFANG {
         public String getChannelCode() {//枚举对象实现抽象方法
-            return "2006";
+            return "3006";
         }
     },
     BAIDU {
         public String getChannelCode() {//枚举对象实现抽象方法
-            return "2017";
+            return "3003";
+        }
+    },
+    TMAIL {
+        public String getChannelCode() {//枚举对象实现抽象方法
+            return "3002";
         }
     };
 

+ 150 - 0
app/src/main/java/com/edufound/reader/bean/PlayLogBean.java

@@ -0,0 +1,150 @@
+package com.edufound.reader.bean;
+
+public class PlayLogBean {
+
+    private String channel;
+    private long exampleId;
+    private String feature;
+    private String gmtCreated;
+    private String gmtModified;
+    private String grade;
+    private long id;
+    private String playDate;
+    private int playStopTime;
+    private String readUid;
+    private String status;
+    private String title;
+    private String type;
+    private String uid;
+    private String url;
+    private long userReadId;
+
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public void setExampleId(long exampleId) {
+        this.exampleId = exampleId;
+    }
+
+    public long getExampleId() {
+        return exampleId;
+    }
+
+    public void setFeature(String feature) {
+        this.feature = feature;
+    }
+
+    public String getFeature() {
+        return feature;
+    }
+
+    public void setGmtCreated(String gmtCreated) {
+        this.gmtCreated = gmtCreated;
+    }
+
+    public String getGmtCreated() {
+        return gmtCreated;
+    }
+
+    public void setGmtModified(String gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setPlayDate(String playDate) {
+        this.playDate = playDate;
+    }
+
+    public String getPlayDate() {
+        return playDate;
+    }
+
+    public void setPlayStopTime(int playStopTime) {
+        this.playStopTime = playStopTime;
+    }
+
+    public int getPlayStopTime() {
+        return playStopTime;
+    }
+
+    public void setReadUid(String readUid) {
+        this.readUid = readUid;
+    }
+
+    public String getReadUid() {
+        return readUid;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUserReadId(long userReadId) {
+        this.userReadId = userReadId;
+    }
+
+    public long getUserReadId() {
+        return userReadId;
+    }
+
+}

+ 47 - 10
app/src/main/java/com/edufound/reader/cusview/RvListJzvdStd.java

@@ -30,10 +30,13 @@ import android.widget.Toast;
 
 import com.edufound.reader.R;
 import com.edufound.reader.bean.ChannelCodeEnum;
+import com.edufound.reader.bean.HttpResultBean;
+import com.edufound.reader.bean.PlayLogBean;
 import com.edufound.reader.botsdk.BotRegisterListener;
 import com.edufound.reader.util.Consts;
 import com.edufound.reader.util.OkHttpClient;
 import com.edufound.reader.util.SizeUtils;
+import com.google.gson.reflect.TypeToken;
 import com.okhttplib.HttpInfo;
 import com.okhttplib.callback.Callback;
 import com.orhanobut.logger.Logger;
@@ -119,6 +122,7 @@ public class RvListJzvdStd extends Jzvd {
 
     public VideoCallBack mCallBack;
 
+    private boolean hideAllUI = false;
 
     public boolean canPause = true;
 
@@ -378,20 +382,20 @@ public class RvListJzvdStd extends Jzvd {
         super.onClick(v);
         int i = v.getId();
         if (i == R.id.poster) {
-            clickPoster();
+//            clickPoster();
         } else if (i == R.id.surface_container) {
-            clickSurfaceContainer();
-            if (clarityPopWindow != null) {
-                clarityPopWindow.dismiss();
-            }
+//            clickSurfaceContainer();
+//            if (clarityPopWindow != null) {
+//                clarityPopWindow.dismiss();
+//            }
         } else if (i == R.id.back) {
-            clickBack();
+//            clickBack();
         } else if (i == R.id.back_tiny) {
-            clickBackTiny();
+//            clickBackTiny();
         } else if (i == R.id.clarity) {
-            clickClarity();
+//            clickClarity();
         } else if (i == R.id.retry_btn) {
-            clickRetryBtn();
+//            clickRetryBtn();
         }
     }
 
@@ -814,6 +818,19 @@ public class RvListJzvdStd extends Jzvd {
 
     public void setAllControlsVisiblity(int topCon, int bottomCon, int startBtn, int loadingPro,
                                         int posterImg, int bottomPro, int retryLayout) {
+        if (hideAllUI) {
+            topContainer.setVisibility(View.GONE);
+            bottomContainer.setVisibility(View.GONE);
+            bottomContainer.setVisibility(View.GONE);
+            startButton.setVisibility(View.GONE);
+            loadingProgressBar.setVisibility(View.GONE);
+            mLoadingLayout.setVisibility(View.GONE);
+            posterImageView.setVisibility(View.VISIBLE);
+            bottomProgressBar.setVisibility(View.GONE);
+            bottomProgressBar.setVisibility(View.GONE);
+            mRetryLayout.setVisibility(View.GONE);
+            return;
+        }
         topContainer.setVisibility(topCon);
         bottomContainer.setVisibility(bottomCon);
         bottomContainer.setVisibility(View.INVISIBLE);
@@ -1035,8 +1052,24 @@ public class RvListJzvdStd extends Jzvd {
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
                 //播放记录
+                Logger.e("info:" + info.getRetDetail());
+                HttpResultBean<PlayLogBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<PlayLogBean>>() {
+                }.getType());
+                //
                 if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
-                    BotRegisterListener.uploadUsage("0", readid, "video", "unpurchased");
+                    /**
+                     * 免责声明!!!!!!!!!!!!!!!!!!
+                     *判断是否是官方的,官方的就是免费的。不是官方的就是收费的。但是无奈老板让收费的也播放。不知道什么意思。如有问题,请勿追究程序员责任。
+                     *@z
+                     */
+                    if (bean.getData().getType().equals("EXAMPLE")) {
+                        //官方的
+//                        Logger.e("上报官方免费的");
+                        BotRegisterListener.uploadUsage("0", readid, "video", "unpurchased");
+                    } else {
+//                        Logger.e("上报别人的书序收费的");
+                        BotRegisterListener.uploadUsage("1", readid, "video", "unpurchased");
+                    }
                 }
             }
 
@@ -1095,6 +1128,10 @@ public class RvListJzvdStd extends Jzvd {
         }
     }
 
+    public void setHideAllUI(boolean hideALl) {
+        hideAllUI = hideALl;
+    }
+
     public void seekTo(int seek) {
         if (mediaInterface != null) {
             mediaInterface.seekTo(seek);

+ 4 - 2
app/src/main/java/com/edufound/reader/popwindow/PopWindowUtil.java

@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.edufound.reader.R;
 import com.edufound.reader.application.EApplication;
@@ -202,11 +203,14 @@ public class PopWindowUtil {
         dialog_view.setFocusable(true);
         ImageView back = dialog_view.findViewById(R.id.popupwindow_bindwechat_back);
         ImageView image = dialog_view.findViewById(R.id.popupwindow_bind_wechat_image);
+        TextView text = dialog_view.findViewById(R.id.popupwindow_bind_wechat_name);
         setClickListener(back, o -> {
             mPopupWindow.dismiss();
             listener.clickCancel();
+            mPresenter.getPopHandler().removeMessages(0x1312);
         });
         mPresenter.getBindWeChatPath(context, image);
+        mPresenter.getMyInfo(context, text);
         mPopupWindow = new PopupWindow(dialog_view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
         mPopupWindow.setFocusable(true);
         mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
@@ -291,8 +295,6 @@ public class PopWindowUtil {
     }
 
 
-
-
     private static void setClickListener(View view, Consumer onNext) {
         RxView.clicks(view).throttleFirst(2, TimeUnit.SECONDS).subscribe(onNext);
     }

+ 15 - 6
app/src/main/java/com/edufound/reader/presenter/MainPresenter.java

@@ -155,16 +155,22 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
 
     @Override
     public void showSelectGradeWindow() {
-        PopWindowUtil.showSelectGradeWindow(mView.getActivity(), mView.getRootView(), 0, new PopUtilClickListener() {
+
+        mView.getRootView().post(new Runnable() {
             @Override
-            public void clickCancel() {
+            public void run() {
+                PopWindowUtil.showSelectGradeWindow(mView.getActivity(), mView.getRootView(), 0, new PopUtilClickListener() {
+                    @Override
+                    public void clickCancel() {
 
-            }
+                    }
 
-            @Override
-            public void clickSubmit(Object object) {
+                    @Override
+                    public void clickSubmit(Object object) {
 //                Toast.makeText(mView.getActivity(), "选择了:" + EfunboxUtil.getEnumByCNGrade(object.toString()), Toast.LENGTH_SHORT).show();
-                MMKVUtil.getInstance().encode(MMKVEncodeKey.USER_GRADE, EfunboxUtil.getEnumByCNGrade(object.toString()));
+                        MMKVUtil.getInstance().encode(MMKVEncodeKey.USER_GRADE, EfunboxUtil.getEnumByCNGrade(object.toString()));
+                    }
+                });
             }
         });
 
@@ -178,12 +184,15 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
             public void onSuccess(HttpInfo info) throws IOException {
                 HttpResultBean<UserBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserBean>>() {
                 }.getType());
+                Logger.e("info.get:" + info.getRetDetail());
                 if (bean.getCode().equals("300")) {
                     //没有用户数据
                     if (TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE))) {
                         //没有选择过年纪,选择年纪
+                        Logger.e("TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE)");
                         showSelectGradeWindow();
                     } else {
+                        Logger.e("TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE)--else");
                         //选择过年纪。无处理
                     }
 //                    registerMobile("18655365222");

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

@@ -25,6 +25,7 @@ import com.edufound.reader.bean.HttpResultBean;
 import com.edufound.reader.bean.MyInfoBean;
 import com.edufound.reader.bean.UserRecordBean;
 import com.edufound.reader.contract.MyTabFragmentContract;
+import com.edufound.reader.cusview.CusToast;
 import com.edufound.reader.listener.PopUtilClickListener;
 import com.edufound.reader.model.CharacterFragmentModel;
 import com.edufound.reader.model.MyTabFragmentModel;
@@ -155,11 +156,11 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
 
             @Override
             public void onAnimationEnd(Animator animator) {
+                changeMyRecordStatusById("{\"id\": " + reader.getId() + ", \t\"status\": \"DEL\" }");
                 gridLayout.removeView(view);
                 mView.loadMoreItem();
-                mDataList.remove(index);
+                mDataList.remove(reader);
                 mView.setRecordSize(mDataList.size());
-                changeMyRecordStatusById("{\"id\": " + reader.getId() + ", \t\"status\": \"DEL\" }");
 
             }
 
@@ -220,6 +221,8 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
                 curPosition = index;
                 changeMyRecordStatusById("{\"id\": " + reader.getId() + ", \t\"status\": \"DISABLE\" }");
                 imgPriv.setImageResource(R.drawable.adapter_item_record_pri);
+            } else {
+                CusToast.getInstance(mContext).show("rdader.getStatus():" + reader.getStatus(), 2000);
             }
         });
         mView.addUiClick(view, o -> {

+ 48 - 13
app/src/main/java/com/edufound/reader/presenter/PopWindowPresneter.java

@@ -1,6 +1,5 @@
 package com.edufound.reader.presenter;
 
-import android.animation.LayoutTransition;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -12,7 +11,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.edufound.reader.R;
 import com.edufound.reader.activity.MainActivity;
@@ -20,14 +18,13 @@ import com.edufound.reader.adapter.PopupMyOrderAdapter;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.application.EApplication;
 import com.edufound.reader.bean.HttpResultBean;
+import com.edufound.reader.bean.MyInfoBean;
 import com.edufound.reader.bean.RecordResultBean;
 import com.edufound.reader.bean.UserRecordBean;
 import com.edufound.reader.listener.PopupRecordStatusListener;
 import com.edufound.reader.model.PopWindowModelImpl;
 import com.edufound.reader.popwindow.PopWindowUtil;
 import com.edufound.reader.util.Consts;
-import com.edufound.reader.util.GlideUtils;
-import com.edufound.reader.util.OkHttpClient;
 import com.edufound.reader.util.QRCodeUtil;
 import com.edufound.reader.util.SizeUtils;
 import com.google.gson.Gson;
@@ -53,6 +50,7 @@ public class PopWindowPresneter {
     ProgressCallback mUploadProgressBack;
     Gson mGson;
     UserApiServerImpl userApi;
+    Activity mActivity;
 
     public PopWindowPresneter() {
         userApi = new UserApiServerImpl();
@@ -60,7 +58,8 @@ public class PopWindowPresneter {
         mGson = new Gson();
     }
 
-    public void initRecordStatusWindow(Activity context, View dialog_view, RecordResultBean bean, UserRecordBean.UserRead userread, PopupRecordStatusListener listener) {
+    public void initRecordStatusWindow(Activity activity, View dialog_view, RecordResultBean bean, UserRecordBean.UserRead userread, PopupRecordStatusListener listener) {
+        mActivity = activity;
         FrameLayout mOverFrame = dialog_view.findViewById(R.id.popupwindow_record_status_over_frame);
         FrameLayout mUploadingFrame = dialog_view.findViewById(R.id.popupwindow_record_status_uploading_frame);
         FrameLayout mUploadingSuccessFrame = dialog_view.findViewById(R.id.popupwindow_record_status_uploading_success_frame);
@@ -96,7 +95,7 @@ public class PopWindowPresneter {
             mOverFrame.setVisibility(View.VISIBLE);
             startLayout.removeAllViews();
             for (int i = 0; i < 5; i++) {
-                ImageView start = new ImageView(context);
+                ImageView start = new ImageView(activity);
                 if (i < startCount) {
                     start.setImageResource(R.drawable.popup_record_status_over_stars_true);
                 } else {
@@ -189,7 +188,7 @@ public class PopWindowPresneter {
                             postUserRead.put("type", "READ");
                             postUserRead.put("uid", Consts.getUID());
 
-                            mModel.postUserRead(context, mGson.toJson(postUserRead), new Callback() {
+                            mModel.postUserRead(activity, mGson.toJson(postUserRead), new Callback() {
                                 @Override
                                 public void onSuccess(HttpInfo info) throws IOException {
                                     //发布朗读成功了,成功之后求情评测数据接口
@@ -203,7 +202,7 @@ public class PopWindowPresneter {
                                     postAssessment.put("score", String.valueOf(score));
                                     postAssessment.put("accuracy", String.valueOf(accuracy));
                                     postAssessment.put("userReadId", read.getData().getId());
-                                    mModel.postAssessment(context, mGson.toJson(postAssessment), new Callback() {
+                                    mModel.postAssessment(activity, mGson.toJson(postAssessment), new Callback() {
                                         @Override
                                         public void onSuccess(HttpInfo info) throws IOException {
                                             Logger.e("请求评测成功:" + info.getRetDetail());
@@ -217,9 +216,9 @@ public class PopWindowPresneter {
                                                     for (int i = 0; i < EApplication.mActivityList.size(); i++) {
                                                         EApplication.mActivityList.get(i).finish();
                                                     }
-                                                    Intent intent = new Intent(context, MainActivity.class);
+                                                    Intent intent = new Intent(activity, MainActivity.class);
                                                     intent.putExtra("defaultIndex", 0);
-                                                    context.startActivity(intent);
+                                                    activity.startActivity(intent);
                                                 }
                                             });
                                         }
@@ -255,7 +254,7 @@ public class PopWindowPresneter {
                                 @Override
                                 public void onClick(View view) {
 //                                    Toast.makeText(context, "重新上传", Toast.LENGTH_SHORT).show();
-                                    mModel.upLoadRecord(context, Consts.getRecordUpLoadFileUrl(), mUploadProgressBack);
+                                    mModel.upLoadRecord(activity, Consts.getRecordUpLoadFileUrl(), mUploadProgressBack);
                                 }
                             });
                         }
@@ -278,7 +277,7 @@ public class PopWindowPresneter {
                     //上传录音
                     mOverFrame.setVisibility(View.GONE);
                     mUploadingFrame.setVisibility(View.VISIBLE);
-                    mModel.upLoadRecord(context, Consts.getRecordUpLoadFileUrl(), mUploadProgressBack);
+                    mModel.upLoadRecord(activity, Consts.getRecordUpLoadFileUrl(), mUploadProgressBack);
 
                 }
             });
@@ -324,6 +323,7 @@ public class PopWindowPresneter {
 
 
     public void getBindWeChatPath(Activity activity, ImageView imageView) {
+        mActivity = activity;
         userApi.getBindWeChatPath(activity, new Callback() {
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
@@ -331,6 +331,7 @@ public class PopWindowPresneter {
                 HttpResultBean<String> bean = info.getRetDetail(new TypeToken<HttpResultBean<String>>() {
                 }.getType());
                 imageView.setImageBitmap(QRCodeUtil.createQRCode(bean.getData(), SizeUtils.dp2px(activity, 900)));
+
             }
 
             @Override
@@ -340,7 +341,38 @@ public class PopWindowPresneter {
         });
     }
 
-    private static Handler handler = new Handler(new Handler.Callback() {
+    public void getMyInfo(Activity activity, TextView textView) {
+        mActivity = activity;
+        userApi.getMyInfo(activity, new Callback() {
+            @Override
+            public void onSuccess(HttpInfo info) throws IOException {
+                HttpResultBean<MyInfoBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<MyInfoBean>>() {
+                }.getType());
+                if (bean.getData().getUser().getOpenId() == null || bean.getData().getUser().getOpenId().equals("")) {
+                    textView.setText("");
+                } else {
+                    textView.setText("微信昵称:" + bean.getData().getUser().getWechatName());
+                    textView.setVisibility(View.VISIBLE);
+                }
+
+            }
+
+            @Override
+            public void onFailure(HttpInfo info) throws IOException {
+
+            }
+        });
+        Message message = new Message();
+        message.obj = textView;
+        message.what = 0x1312;
+        handler.sendMessageDelayed(message, 3000);
+    }
+
+    public Handler getPopHandler() {
+        return handler;
+    }
+
+    private Handler handler = new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(@NonNull Message message) {
             switch (message.what) {
@@ -348,6 +380,9 @@ public class PopWindowPresneter {
                 case 0x0131:
                     ((TextView) message.obj).setText(message.arg1 + "/100");
                     break;
+                case 0x1312:
+                    getMyInfo(mActivity, (TextView) message.obj);
+                    break;
 
             }
             return false;

+ 4 - 2
app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java

@@ -261,8 +261,10 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             public void onFailure(HttpInfo info) throws IOException {
                 Logger.e("info:" + info.getRetDetail());
                 Logger.e("info-getRetCode:" + info.getRetCode());
-                Logger.e("info-getUrl:" + info.getUrl());
-                Logger.e("info-getUrl:" + info.getParams().toString());
+                //getRetCode==6
+                if (info.getRetCode() == 6) {
+                    getRecommendDataList();
+                }
 
 //                CusToast.getInstance(mView.getActivity()).show(info.getRetDetail(), 3000);
 //                Toast.makeText(mView.getActivity(), info.getRetDetail(), Toast.LENGTH_SHORT).show();

+ 5 - 0
app/src/main/java/com/edufound/reader/presenter/RecordPresenter.java

@@ -132,6 +132,8 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
     public void clickExampleUI() {
         playType = "EXAMPLE";
         initVideoPlayer(exampleUrl);
+//        mView.getJZVideoView().posterImageView.setVisibility(View.INVISIBLE);
+        mView.getJZVideoView().setHideAllUI(false);
         mView.getJZVideoView().startVideoAfterPreloading();
     }
 
@@ -200,6 +202,7 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
 
     @Override
     public void startRecord() {
+        mView.getJZVideoView().setHideAllUI(false);
         mView.hasShowOtherUI(View.INVISIBLE);
         playType = "READ";
         initVideoPlayer(recordUrl);
@@ -209,10 +212,12 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
     @Override
     public void stopRecord() {
         mView.hasShowOtherUI(View.VISIBLE);
+        mView.getJZVideoView().setHideAllUI(true);
         mView.getJZVideoView().reset();
         mRecordServices.stopRecord();
 //        mView.getJZVideoView().setCanPause(true);
 //        initVideoPlayer(recordUrl);
+
         mView.getJZVideoView().posterImageView.setVisibility(View.VISIBLE);
 
     }

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

@@ -202,7 +202,7 @@ public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> im
                         return true;
                     }
                     mDataList.forEach((item) -> {
-                        mDesList.add(item.getTask().getTitle() + ",奖励" + item.getTask().getSort() + "朵小红花," + "每日" + item.getTask().getJoinAmount() + "次上限");
+                        mDesList.add(item.getTask().getTitle() + ",奖励" + item.getTask().getSort() + "朵小红花," + "每日上限" + item.getTask().getJoinAmount() + "次。");
                     });
                     break;
             }

+ 3 - 1
app/src/main/java/com/edufound/reader/receiver/BackPageReceiver.java

@@ -48,7 +48,9 @@ public class BackPageReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        mBackListener.pageBack(intent);
+        if (mBackListener != null) {
+            mBackListener.pageBack(intent);
+        }
     }
 
     public static void registerReceiver(Context context, String action) {

+ 0 - 1
app/src/main/java/com/edufound/reader/services/RecordServices.java

@@ -87,7 +87,6 @@ public class RecordServices extends Service {
                 public void onSuccess(Engine engine) {
                     // 创建成功, 请保存engine对象用于后续评测
                     mAiengine = engine;
-                    Logger.e("mAiengine is null:" + (mAiengine == null));
                     Logger.e("初始化录音成功");
                     mRecordCreate = true;
                 }

+ 1 - 1
app/src/main/java/com/edufound/reader/util/HttpInterceptor.java

@@ -46,7 +46,7 @@ public class HttpInterceptor {
                     break;
                 case HttpInfo.CheckNet:
 //                    Toast.makeText(Consts.getmApplicAtion(), "请检查网络连接是否正常", Toast.LENGTH_SHORT).show();
-                    info.setRetDetail(info.getUrl() + "---请检查网络连接是否正常[" + info.getNetCode() + "]");
+                    info.setRetDetail(info.getUrl() + "请检查网络连接是否正常[" + info.getNetCode() + "]");
                     break;
                 case HttpInfo.ConnectionTimeOut:
 //                    CusToast.getInstance(Consts.getmApplicAtion()).show("手机号不正确", 2000);

+ 1 - 7
app/src/main/java/com/edufound/reader/util/OkHttpClient.java

@@ -53,8 +53,7 @@ public class OkHttpClient {
     }
 
     public static void doGetAsync(Activity activity, HttpInfo.Builder info, BaseCallback callback) {
-        Logger.e("postUid:" + Consts.getUID());
-        if (!info.build().getUrl().contains("posts/list")) {
+        if (!info.build().getUrl().contains("posts/list") && !info.build().getUrl().contains("/userRead/check")) {
             Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
             Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         }
@@ -63,14 +62,12 @@ public class OkHttpClient {
 
 
     public static void doPostAsync(Activity activity, HttpInfo.Builder info, BaseCallback callback) {
-        Logger.e("postUid:" + Consts.getUID());
         Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
         Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         OkHttpUtil.getDefault(activity).doPostAsync(info.addHead("uid", Consts.getUID()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doPostAsync(HttpInfo.Builder info, BaseCallback callback) {
-        Logger.e("info.build().getUrl():" + info.build().getUrl());
         if (!info.build().getUrl().contains("playLog")) {
             Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
             Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
@@ -79,21 +76,18 @@ public class OkHttpClient {
     }
 
     public static void doPutAsync(Activity activity, HttpInfo.Builder info, BaseCallback callback) {
-        Logger.e("postUid:" + Consts.getUID());
         Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
         Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         OkHttpUtil.getDefault(activity).doPutAsync(info.addHead("uid", Consts.getUID()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doDeleteAsync(Activity activity, HttpInfo.Builder info, BaseCallback callback) {
-        Logger.e("postUid:" + Consts.getUID());
         Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
         Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         OkHttpUtil.getDefault(activity).doDeleteAsync(info.addHead("uid", Consts.getUID()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doUploadFile(Activity activity, HttpInfo.Builder info) {
-        Logger.e("postUid:" + Consts.getUID());
         OkHttpUtil.getDefault(activity).doUploadFileAsync(info.addHead("uid", Consts.getUID()).build());
     }
 

app/src/main/res/drawable-v24/popupwindow_select_grade_selector.xml → app/src/main/res/drawable/popupwindow_select_grade_selector.xml


+ 5 - 5
app/src/main/res/layout/activity_saffloer.xml

@@ -184,7 +184,7 @@
             android:layout_width="1280dp"
             android:layout_height="720dp"
             android:orientation="vertical"
-            android:visibility="gone"
+            android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="h,16:9"
             app:layout_constraintEnd_toEndOf="parent"
@@ -203,7 +203,7 @@
                     android:layout_height="280dp"
                     android:layout_gravity="center"
                     android:layout_marginLeft="30dp"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="30dp"
                     android:layout_marginRight="30dp">
 
                 <LinearLayout
@@ -211,9 +211,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_gravity="center|top"
-                        android:layout_marginLeft="50dp"
-                        android:layout_marginRight="50dp"
-                        android:divider="@drawable/main_left_tab_divider"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="20dp"
+                        android:divider="@drawable/activity_saffloer_window_item_divier"
                         android:gravity="center|top"
                         android:orientation="vertical"
                         android:showDividers="middle">

+ 2 - 2
app/src/main/res/layout/activity_saffloer_window_item.xml

@@ -8,7 +8,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:gravity="center|left"
+            android:gravity="left"
             android:orientation="horizontal">
 
         <ImageView
@@ -25,6 +25,6 @@
                 android:layout_marginLeft="18dp"
                 android:text="留下配音作品1篇奖励10朵小红花留下配音作品1篇奖励10朵小红花留下配音作品1篇奖励10朵小红花留下配音作品1篇奖励10朵小红花留下配音作品1篇奖励10朵小红花留下配音作品1篇奖励10朵小红花,每日5次上限"
                 android:textColor="#333333"
-                android:textSize="26dp"></TextView>
+                android:textSize="23dp"></TextView>
     </LinearLayout>
 </LinearLayout>