Explorar o código

1.修改小度出现的问题
2.修改注册成功没关闭界面的问题

FailedToRead %!s(int64=2) %!d(string=hai) anos
pai
achega
ea75e03639

+ 2 - 1
.idea/misc.xml

@@ -113,13 +113,14 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.4931640625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.4699248120300752" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/drawable/slidevideo_switch_track_selector.xml" value="0.2005" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.33" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/activity_smallfull_video.xml" value="0.21897810218978103" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_exit_login.xml" value="0.2384428223844282" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade.xml" value="0.1922141119221411" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/drawable/activity_comment_item_divier.xml" value="0.2005" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_comment.xml" value="0.1873479318734793" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_main.xml" value="0.2" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_otherrecord.xml" value="0.30900243309002434" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.33" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_item.xml" value="0.21897810218978103" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail.xml" value="0.33" />

+ 6 - 2
app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.edufound.reader"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 2
-        versionName "1.2"
+        versionCode 3
+        versionName "1.3"
         flavorDimensions "versionCode"
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2006"]//添加一个默认渠道号
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -109,6 +109,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    aaptOptions {
+        additionalParameters =["--warn-manifest-validation"]
+
+    }
 }
 
 dependencies {

+ 203 - 203
app/src/fragmentRecommend/layout/fragment_main_recommend.xml

@@ -1,286 +1,286 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center">
 
     <FrameLayout
-            android:layout_width="1002dp"
-            android:layout_height="700dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp">
+        android:layout_width="1002dp"
+        android:layout_height="700dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp">
 
         <ImageView
-                android:layout_width="972dp"
-                android:layout_height="650dp"
-                android:background="@drawable/fragment_recommend_bg"></ImageView>
+            android:layout_width="972dp"
+            android:layout_height="650dp"
+            android:background="@drawable/fragment_recommend_bg"></ImageView>
 
         <LinearLayout
-                android:layout_width="972dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center|left"
-                android:gravity="center"
-                android:orientation="vertical">
+            android:layout_width="972dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center|left"
+            android:gravity="center"
+            android:orientation="vertical">
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_gravity="center"
-                    android:layout_weight="3"
-                    android:paddingTop="10dp">
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_gravity="center"
+                android:layout_weight="3"
+                android:paddingTop="10dp">
 
                 <FrameLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1.5">
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1.5">
 
                     <FrameLayout
-                            android:id="@+id/fragment_recommend_user_head_layout"
-                            android:layout_width="272dp"
-                            android:layout_height="61dp"
-                            android:layout_gravity="center">
+                        android:id="@+id/fragment_recommend_user_head_layout"
+                        android:layout_width="272dp"
+                        android:layout_height="61dp"
+                        android:layout_gravity="center">
 
                         <ImageView
-                                android:layout_width="242dp"
-                                android:layout_height="52dp"
-                                android:layout_gravity="center|right"
-                                android:background="@drawable/fragment_recommend_userhead_bg"></ImageView>
+                            android:layout_width="242dp"
+                            android:layout_height="52dp"
+                            android:layout_gravity="center|right"
+                            android:background="@drawable/fragment_recommend_userhead_bg"></ImageView>
 
                         <FrameLayout
-                                android:layout_width="54dp"
-                                android:layout_height="match_parent">
+                            android:layout_width="54dp"
+                            android:layout_height="match_parent">
 
                             <FrameLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="54dp"
-                                    android:background="@drawable/fragment_recommend_userhead"
-                                    android:padding="4dp">
+                                android:layout_width="match_parent"
+                                android:layout_height="54dp"
+                                android:background="@drawable/fragment_recommend_userhead"
+                                android:padding="4dp">
 
                                 <ImageView
-                                        android:id="@+id/fragment_recommend_user_head"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="match_parent" />
+                                    android:id="@+id/fragment_recommend_user_head"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent" />
 
                             </FrameLayout>
 
                             <ImageView
-                                    android:id="@+id/fragment_main_recommend_isfollow"
-                                    android:layout_width="20dp"
-                                    android:layout_height="20dp"
-                                    android:layout_gravity="center|bottom"
-                                    android:layout_marginBottom="4dp"
-                                    android:src="@drawable/plus"></ImageView>
+                                android:id="@+id/fragment_main_recommend_isfollow"
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_gravity="center|bottom"
+                                android:layout_marginBottom="4dp"
+                                android:src="@drawable/plus"></ImageView>
                         </FrameLayout>
 
                         <TextView
-                                android:id="@+id/fragment_recommend_user_phone"
-                                android:layout_width="match_parent"
-                                android:layout_height="55dp"
-                                android:layout_gravity="center|top"
-                                android:layout_marginLeft="20dp"
-                                android:gravity="center"
-                                android:text="*****"
-                                android:textColor="@color/fragment_recommend_user_color"
-                                android:textSize="28dp"></TextView>
+                            android:id="@+id/fragment_recommend_user_phone"
+                            android:layout_width="match_parent"
+                            android:layout_height="55dp"
+                            android:layout_gravity="center|top"
+                            android:layout_marginLeft="20dp"
+                            android:gravity="center"
+                            android:text="*****"
+                            android:textColor="@color/fragment_recommend_user_color"
+                            android:textSize="28dp"></TextView>
                     </FrameLayout>
 
                 </FrameLayout>
 
                 <FrameLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
 
                     <FrameLayout
-                            android:id="@+id/fragment_recommend_comment_layout"
-                            android:layout_width="160dp"
-                            android:layout_height="61dp"
-                            android:layout_gravity="center">
+                        android:id="@+id/fragment_recommend_comment_layout"
+                        android:layout_width="160dp"
+                        android:layout_height="61dp"
+                        android:layout_gravity="center">
 
                         <ImageView
-                                android:layout_width="143dp"
-                                android:layout_height="52dp"
-                                android:layout_gravity="center|right"
-                                android:scaleType="fitXY"
-                                android:src="@drawable/fragment_recommend_userhead_bg"></ImageView>
+                            android:layout_width="143dp"
+                            android:layout_height="52dp"
+                            android:layout_gravity="center|right"
+                            android:scaleType="fitXY"
+                            android:src="@drawable/fragment_recommend_userhead_bg"></ImageView>
 
                         <FrameLayout
-                                android:layout_width="52dp"
-                                android:layout_height="match_parent">
+                            android:layout_width="52dp"
+                            android:layout_height="match_parent">
 
 
                             <ImageView
-                                    android:layout_width="52dp"
-                                    android:layout_height="52dp"
-                                    android:layout_gravity="center"
-                                    android:src="@drawable/fragment_recommend_comment" />
+                                android:layout_width="52dp"
+                                android:layout_height="52dp"
+                                android:layout_gravity="center"
+                                android:src="@drawable/fragment_recommend_comment" />
 
 
                         </FrameLayout>
 
                         <TextView
-                                android:id="@+id/fragment_recommend_comment_num"
-                                android:layout_width="match_parent"
-                                android:layout_height="55dp"
-                                android:layout_gravity="center|top"
-                                android:layout_marginLeft="10dp"
-                                android:gravity="center"
-                                android:text="0"
-                                android:textColor="@color/fragment_recommend_user_color"
-                                android:textSize="28dp"></TextView>
+                            android:id="@+id/fragment_recommend_comment_num"
+                            android:layout_width="match_parent"
+                            android:layout_height="55dp"
+                            android:layout_gravity="center|top"
+                            android:layout_marginLeft="10dp"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@color/fragment_recommend_user_color"
+                            android:textSize="28dp"></TextView>
                     </FrameLayout>
 
                 </FrameLayout>
 
                 <FrameLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
 
                     <FrameLayout
-                            android:id="@+id/fragment_recommend_collection_layout"
-                            android:layout_width="160dp"
-                            android:layout_height="61dp"
-                            android:layout_gravity="center">
+                        android:id="@+id/fragment_recommend_collection_layout"
+                        android:layout_width="160dp"
+                        android:layout_height="61dp"
+                        android:layout_gravity="center">
 
                         <ImageView
-                                android:layout_width="143dp"
-                                android:layout_height="52dp"
-                                android:layout_gravity="center|right"
-                                android:scaleType="fitXY"
-                                android:src="@drawable/fragment_recommend_userhead_bg"></ImageView>
+                            android:layout_width="143dp"
+                            android:layout_height="52dp"
+                            android:layout_gravity="center|right"
+                            android:scaleType="fitXY"
+                            android:src="@drawable/fragment_recommend_userhead_bg"></ImageView>
 
                         <FrameLayout
-                                android:layout_width="54dp"
-                                android:layout_height="match_parent">
+                            android:layout_width="54dp"
+                            android:layout_height="match_parent">
 
 
                             <ImageView
-                                    android:id="@+id/fragment_recommend_collection_icon"
-                                    android:layout_width="52dp"
-                                    android:layout_height="52dp"
-                                    android:layout_gravity="center|left"
-                                    android:src="@drawable/fragment_recommend_collection_icon" />
+                                android:id="@+id/fragment_recommend_collection_icon"
+                                android:layout_width="52dp"
+                                android:layout_height="52dp"
+                                android:layout_gravity="center|left"
+                                android:src="@drawable/fragment_recommend_collection_icon" />
 
 
                         </FrameLayout>
 
                         <TextView
-                                android:id="@+id/fragment_recommend_collection_status"
-                                android:layout_width="match_parent"
-                                android:layout_height="55dp"
-                                android:layout_gravity="center|top"
-                                android:layout_marginLeft="15dp"
-                                android:gravity="center"
-                                android:text="未收藏"
-                                android:textColor="@color/fragment_recommend_user_color"
-                                android:textSize="28dp"></TextView>
+                            android:id="@+id/fragment_recommend_collection_status"
+                            android:layout_width="match_parent"
+                            android:layout_height="55dp"
+                            android:layout_gravity="center|top"
+                            android:layout_marginLeft="15dp"
+                            android:gravity="center"
+                            android:text="未收藏"
+                            android:textColor="@color/fragment_recommend_user_color"
+                            android:textSize="28dp"></TextView>
                     </FrameLayout>
                 </FrameLayout>
 
                 <FrameLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
 
                     <FrameLayout
-                            android:id="@+id/fragment_recommend_thumbs_layout"
-                            android:layout_width="160dp"
-                            android:layout_height="61dp"
-                            android:layout_gravity="center">
+                        android:id="@+id/fragment_recommend_thumbs_layout"
+                        android:layout_width="160dp"
+                        android:layout_height="61dp"
+                        android:layout_gravity="center">
 
                         <ImageView
-                                android:layout_width="143dp"
-                                android:layout_height="52dp"
-                                android:layout_gravity="center|right"
-                                android:scaleType="fitXY"
-                                android:src="@drawable/fragment_recommend_userhead_bg"></ImageView>
+                            android:layout_width="143dp"
+                            android:layout_height="52dp"
+                            android:layout_gravity="center|right"
+                            android:scaleType="fitXY"
+                            android:src="@drawable/fragment_recommend_userhead_bg"></ImageView>
 
                         <FrameLayout
-                                android:layout_width="54dp"
-                                android:layout_height="match_parent">
+                            android:layout_width="54dp"
+                            android:layout_height="match_parent">
 
 
                             <ImageView
-                                    android:id="@+id/fragment_recommend_thumbs_icon"
-                                    android:layout_width="52dp"
-                                    android:layout_height="52dp"
-                                    android:layout_gravity="center|left"
-                                    android:src="@drawable/fragment_recommend_thumbs_up" />
+                                android:id="@+id/fragment_recommend_thumbs_icon"
+                                android:layout_width="52dp"
+                                android:layout_height="52dp"
+                                android:layout_gravity="center|left"
+                                android:src="@drawable/fragment_recommend_thumbs_up" />
 
 
                         </FrameLayout>
 
                         <TextView
-                                android:id="@+id/fragment_recommend_thumbs_num"
-                                android:layout_width="match_parent"
-                                android:layout_height="55dp"
-                                android:layout_gravity="center|top"
-                                android:layout_marginLeft="10dp"
-                                android:gravity="center"
-                                android:text="0"
-                                android:textColor="@color/fragment_recommend_user_color"
-                                android:textSize="28dp"></TextView>
+                            android:id="@+id/fragment_recommend_thumbs_num"
+                            android:layout_width="match_parent"
+                            android:layout_height="55dp"
+                            android:layout_gravity="center|top"
+                            android:layout_marginLeft="10dp"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@color/fragment_recommend_user_color"
+                            android:textSize="28dp"></TextView>
                     </FrameLayout>
                 </FrameLayout>
 
             </LinearLayout>
 
             <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginBottom="20dp"
-                    android:layout_weight="15">
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
+                android:layout_weight="15">
 
                 <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/fragment_recommend_recyclerview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:orientation="vertical"></androidx.recyclerview.widget.RecyclerView>
+                    android:id="@+id/fragment_recommend_recyclerview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"></androidx.recyclerview.widget.RecyclerView>
 
 
             </FrameLayout>
 
 
             <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1.6">
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1.6">
 
                 <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="42dp"
-                        android:layout_gravity="top"
-                        android:gravity="top">
+                    android:layout_width="match_parent"
+                    android:layout_height="42dp"
+                    android:layout_gravity="top"
+                    android:gravity="top">
 
                     <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1">
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
                         <ImageView
-                                android:id="@+id/fragment_recommend_video_up"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center|top"
-                                android:src="@drawable/fragment_recommend_up"></ImageView>
+                            android:id="@+id/fragment_recommend_video_up"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center|top"
+                            android:src="@drawable/fragment_recommend_up"></ImageView>
                     </FrameLayout>
 
                     <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1">
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
                         <ImageView
-                                android:id="@+id/fragment_recommend_video_next"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center|top"
-                                android:src="@drawable/fragment_recommend_next"></ImageView>
+                            android:id="@+id/fragment_recommend_video_next"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center|top"
+                            android:src="@drawable/fragment_recommend_next"></ImageView>
                     </FrameLayout>
 
 
@@ -292,51 +292,51 @@
         </LinearLayout>
 
         <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|right">
 
             <LinearLayout
-                    android:id="@+id/fragment_recommend_to_record_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                android:id="@+id/fragment_recommend_to_record_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <FrameLayout
-                        android:layout_width="121dp"
-                        android:layout_height="121dp">
+                    android:layout_width="121dp"
+                    android:layout_height="121dp">
 
                     <ImageView
-                            android:id="@+id/fragment_recommend_to_record_bg"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center"
-                            android:src="@drawable/to_record_bg"></ImageView>
+                        android:id="@+id/fragment_recommend_to_record_bg"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:src="@drawable/to_record_bg"></ImageView>
 
                     <ImageView
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center"
-                            android:padding="10dp"
-                            android:src="@drawable/to_record_icon"></ImageView>
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:padding="10dp"
+                        android:src="@drawable/to_record_icon"></ImageView>
 
                     <ImageView
-                            android:id="@+id/fragment_recommend_to_record_icon"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center"
-                            android:padding="38dp"
-                            android:src="@drawable/to_record_icon_mike"></ImageView>
+                        android:id="@+id/fragment_recommend_to_record_icon"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:padding="38dp"
+                        android:src="@drawable/to_record_icon_mike"></ImageView>
 
 
                 </FrameLayout>
 
                 <ImageView
-                        android:layout_width="105dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center|top"
-                        android:layout_marginBottom="15dp"
-                        android:src="@drawable/to_record"></ImageView>
+                    android:layout_width="105dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center|top"
+                    android:layout_marginBottom="15dp"
+                    android:src="@drawable/to_record"></ImageView>
             </LinearLayout>
 
             <ImageView

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

@@ -15,6 +15,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="com.baidu.baiduaccount.permission.READ_USERINFO" />
 
+    <profileable android:shell="true" />
     <application
         android:name=".application.EApplication"
         android:allowBackup="true"

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

@@ -9,6 +9,7 @@ import android.widget.CompoundButton;
 import android.widget.Switch;
 
 import com.edufound.reader.R;
+import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.bean.CommentListBean;
 import com.edufound.reader.bean.HttpResultBean;
 import com.edufound.reader.bean.HttpResultDataListBean;
@@ -63,7 +64,9 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
     public void onBindViewHolder(@NonNull VideoHolder holder, int position) {
 //        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);
+        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+            GlideUtils.loadImageSizeKipMemoryCache(mContext, mListData.get(position).getUserRead().getCoverImg(), holder.mVideo.posterImageView);
+        }
         holder.initDanMu(mListData.get(position).getUserRead().getId());
         holder.mVideo.startPreloading();
         holder.mSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -78,6 +81,8 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
                 }
             }
         });
+
+
 //        holder.mVideo.posterImageView.setImageURI(Uri.parse(mListData.get(position).videoUrl));
 
     }
@@ -112,10 +117,11 @@ class VideoHolder extends RecyclerView.ViewHolder {
         mContext = context;
         mItemView = itemView;
         mVideo = itemView.findViewById((R.id.slidevideo_video));
-        mMarqueen = itemView.findViewById(R.id.slidevideo_video_marqueen);
         mSwitch = itemView.findViewById(R.id.slidevideo_video_switch);
-        mSwitch.setChecked(true);
-
+        mSwitch.setVisibility(View.INVISIBLE);
+//        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+        mMarqueen = itemView.findViewById(R.id.slidevideo_video_marqueen);
+        mSwitch.setChecked(false);
         if (mSwitch.isChecked()) {
             mMarqueen.setVisibility(View.VISIBLE);
             mMarqueen.start();
@@ -123,6 +129,8 @@ class VideoHolder extends RecyclerView.ViewHolder {
             mMarqueen.setVisibility(View.INVISIBLE);
             mMarqueen.stop();
         }
+//        }
+
     }
 
 

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

@@ -64,7 +64,7 @@ public class EApplication extends Application {
 
             //初始化异常监听
 //            CrashHandler.getInstance().init(this);
-            initException();
+//            initException();
 
             XmlPullParserFactory.newInstance().setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
 

+ 4 - 1
app/src/main/java/com/edufound/reader/base/BaseActivity.java

@@ -542,6 +542,8 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        Runtime.getRuntime().gc();
+        System.gc();
         if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
             mAliTVASRManager.release();
         }
@@ -861,7 +863,8 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     }
 
-    protected void onAppScreenOff(){}
+    protected void onAppScreenOff() {
+    }
 
 
 }

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

@@ -48,6 +48,10 @@ public interface RecommendFragmentContract {
 
         ImageView getisViewUI();
 
+        void clearRecyclerView();
+
+
+
     }
 
     interface Presenter {

+ 32 - 6
app/src/main/java/com/edufound/reader/cusview/RvListJzvdStd.java

@@ -88,12 +88,7 @@ public class RvListJzvdStd extends Jzvd {
             }
         }
     };
-    protected DismissControlViewTimerTask mDismissControlViewTimerTask;
-    protected Dialog mProgressDialog;
-    protected ProgressBar mDialogProgressBar;
-    protected TextView mDialogSeekTime;
-    protected TextView mDialogTotalTime;
-    protected ImageView mDialogIcon;
+
     protected Dialog mVolumeDialog;
     protected ProgressBar mDialogVolumeProgressBar;
     protected TextView mDialogVolumeTextView;
@@ -1031,6 +1026,7 @@ public class RvListJzvdStd extends Jzvd {
         } else {
             Runtime.getRuntime().gc();
             Log.i(TAG, "onAutoCompletion " + " [" + this.hashCode() + "] ");
+            Logger.e("screen!=SCREEN_FULLSCREEN");
             cancelProgressTimer();
             dismissBrightnessDialog();
             dismissProgressDialog();
@@ -1040,6 +1036,7 @@ public class RvListJzvdStd extends Jzvd {
             JZUtils.scanForActivity(getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }
         if (mCallBack != null) {
+            resView();
             mCallBack.onComplete();
         }
 
@@ -1047,6 +1044,35 @@ public class RvListJzvdStd extends Jzvd {
 //        CToast.makeText(jzvdContext, "onCompletion", 3000).show();
     }
 
+    void resView() {
+
+        mediaInterface.release();
+//        backButton = null;
+//        bottomProgressBar = null;
+//        loadingProgressBar = null;
+//        titleTextView = null;
+//        posterImageView = null;
+//        tinyBackImageView = null;
+//        batteryTimeLayout = null;
+//        batteryLevel = null;
+//        videoCurrentTime = null;
+//        replayTextView = null;
+//        clarity = null;
+//        mRetryBtn = null;
+//        mRetryLayout = null;
+//        battertReceiver = null;
+//        mDialogBrightnessProgressBar = null;
+//        mDialogBrightnessTextView = null;
+//        mBrightnessDialog = null;
+//        mDialogVolumeImageView = null;
+//        mDialogVolumeTextView = null;
+//        mDialogVolumeProgressBar = null;
+//        mVolumeDialog = null;
+//        wifiReceiver = null;
+//        Runtime.getRuntime().gc();
+//        System.gc();
+    }
+
     public void postPlayLog(String readid) {
         OkHttpClient.doPostAsync(new HttpInfo.Builder().setUrl(Consts.getFinalApi() + "/playLog").addParamJson("{\"userReadId\":\"" + readid + "\",\"playStopTime\":\"0\",\"channel\":\"" + Consts.getUmengChannel() + "\"}"), new Callback() {
             @Override

+ 1 - 0
app/src/main/java/com/edufound/reader/fragment/CharacterFragment.java

@@ -131,6 +131,7 @@ public class CharacterFragment extends BaseMvpFragment<CharacterFragmentPresente
     @Override
     public void onDestroy() {
         isNeedLoad = true;
+        mGridLayout.removeAllViews();
         mPresenter.onDestory(mGridLayout);
         super.onDestroy();
     }

+ 43 - 23
app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -77,6 +77,7 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
 
     String intoPage;
 
+
     public RecommendFragment(int type) {
         mFragmentType = type;
     }
@@ -105,30 +106,42 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         mThumbCount = view.findViewById(R.id.fragment_recommend_thumbs_num);
         isFollow = view.findViewById(R.id.fragment_main_recommend_isfollow);
         isUserVip = view.findViewById(R.id.fragment_recommend_app_user_isvip);
-        //录音按钮背景旋转
-        mToRecordRotationbg = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_bg);
-        mRotationImgAnim = ObjectAnimator.ofFloat(mToRecordRotationbg, "rotation", 0.0F, 359.0F);
-        mRotationImgAnim.setRepeatCount(-1);
-        mRotationImgAnim.setDuration(1500);
-        LinearInterpolator interpolator = new LinearInterpolator();
-        mRotationImgAnim.setInterpolator(interpolator); //设置匀速旋转,不卡顿 icon_anim.start();
-        mRotationImgAnim.start();
+
+//        int scaleTime = 0;
+//        int rotateTime = 0;
+//        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+//            //录音按钮背景旋转
+//            scaleTime = 5000;
+//            rotateTime = 3000;
+//        } else {
+//            scaleTime = 1000;
+//            rotateTime = 1500;
+//        }
+//        mToRecordRotationbg = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_bg);
+//        mRotationImgAnim = ObjectAnimator.ofFloat(mToRecordRotationbg, "rotation", 0.0F, 359.0F);
+//        mRotationImgAnim.setRepeatCount(-1);
+//        mRotationImgAnim.setDuration(1500);
+//        LinearInterpolator interpolator = new LinearInterpolator();
+//        mRotationImgAnim.setInterpolator(interpolator); //设置匀速旋转,不卡顿 icon_anim.start();
+//        mRotationImgAnim.start();
+
         //录音按钮缩小放大
-        mToRecordScaleIcon = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_icon);
-        mToRecordScaleXAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleX", 1F, 1.2F);//设置Y轴的立体旋转动画
-        mToRecordScaleXAnim.setRepeatCount(-1);
-        mToRecordScaleXAnim.setRepeatMode(ObjectAnimator.REVERSE);
-        mToRecordScaleXAnim.setDuration(1000);
-        LinearInterpolator interpolator2 = new LinearInterpolator();
-        mToRecordScaleXAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
-        mToRecordScaleYAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleY", 1F, 1.2F);//设置Y轴的立体旋转动画
-        mToRecordScaleYAnim.setRepeatCount(-1);
-        mToRecordScaleYAnim.setRepeatMode(ObjectAnimator.REVERSE);
-        mToRecordScaleYAnim.setDuration(1000);
-        mToRecordScaleYAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
-        AnimatorSet animatorSet = new AnimatorSet();
-        animatorSet.play(mToRecordScaleXAnim).with(mToRecordScaleYAnim);
-        animatorSet.start();
+//        mToRecordScaleIcon = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_icon);
+//        mToRecordScaleXAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleX", 1F, 1.2F);//设置Y轴的立体旋转动画
+//        mToRecordScaleXAnim.setRepeatCount(-1);
+//        mToRecordScaleXAnim.setRepeatMode(ObjectAnimator.REVERSE);
+//        mToRecordScaleXAnim.setDuration(scaleTime);
+//        LinearInterpolator interpolator2 = new LinearInterpolator();
+//        mToRecordScaleXAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
+//        mToRecordScaleYAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleY", 1F, 1.2F);//设置Y轴的立体旋转动画
+//        mToRecordScaleYAnim.setRepeatCount(-1);
+//        mToRecordScaleYAnim.setRepeatMode(ObjectAnimator.REVERSE);
+//        mToRecordScaleYAnim.setDuration(scaleTime);
+//        mToRecordScaleYAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
+//        AnimatorSet animatorSet = new AnimatorSet();
+//        animatorSet.play(mToRecordScaleXAnim).with(mToRecordScaleYAnim);
+//        animatorSet.start();
+
 
     }
 
@@ -353,10 +366,17 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         return isUserVip;
     }
 
+    @Override
+    public void clearRecyclerView() {
+        mRecyclerView.removeAllViews();
+        mRecyclerView = null;
+    }
+
 
     @Override
     public void onDestroy() {
 
+
         mPresenter.activityDestory();
         mPresenter.detachView();
         super.onDestroy();

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

@@ -161,7 +161,7 @@ public class LoginAlertPresenter extends BasePresenter<LoginAlertContract.View>
                     @Override
                     public void onSuccess(HttpInfo info) throws IOException {
 //                            Logger.e("注册成功:" + info.getRetDetail());
-                        Toast.makeText(mView.getActivity(), "注册成功", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(mView.getActivity(), "登录成功", Toast.LENGTH_SHORT).show();
                         HttpResultBean<UserBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserBean>>() {
                         }.getType());
                         Consts.setUID(bean.getData().getUid());
@@ -202,7 +202,7 @@ public class LoginAlertPresenter extends BasePresenter<LoginAlertContract.View>
                     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("info.getRetDetail():" + info.getRetDetail());
                         Logger.e("bean.getData():" + bean.getData());
                         Consts.setIsYFVip(true);
                         mView.getActivity().finish();
@@ -210,10 +210,13 @@ public class LoginAlertPresenter extends BasePresenter<LoginAlertContract.View>
 
                     @Override
                     public void onFailure(HttpInfo info) throws IOException {
-
+//                        Toast.makeText(mView.getActivity(),"")
+                        mView.getActivity().finish();
                     }
                 });
             }
+        } else {
+            mView.getActivity().finish();
         }
     }
 

+ 8 - 2
app/src/main/java/com/edufound/reader/presenter/MainPresenter.java

@@ -36,6 +36,7 @@ import com.edufound.reader.util.MMKVEncodeKey;
 import com.edufound.reader.util.MMKVUtil;
 import com.edufound.reader.util.SizeUtils;
 import com.edufound.reader.util.TimeUtil;
+import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.okhttplib.HttpInfo;
 import com.okhttplib.callback.Callback;
@@ -206,6 +207,9 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
                 Logger.e("info.get:" + info.getRetDetail());
+                Gson gson = new Gson();
+                String jsonssss = gson.toJson(info.getHeads());
+                Logger.e("info.getHead:" + jsonssss);
                 try {
                     JSONObject object = new JSONObject(info.getRetDetail());
                     if (object.getString("code").equals("300") || object.getInt("code") == 300) {
@@ -282,9 +286,11 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
                     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("info.getRetDetail():" + info.getRetDetail());
                         Logger.e("bean.getData():" + bean.getData());
-                        Consts.setIsYFVip(true);
+                        if (!TextUtils.isEmpty(bean.getData())) {
+                            Consts.setIsYFVip(true);
+                        }
                     }
 
                     @Override

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

@@ -160,6 +160,9 @@ public class OthersRecordPresenter extends BasePresenter<OthersRecordContract.Vi
             public void onSuccess(HttpInfo info) throws IOException {
                 HttpResultBean<HttpResultDataListBean<UserRecordBean>> bean = info.getRetDetail(new TypeToken<HttpResultBean<HttpResultDataListBean<UserRecordBean>>>() {
                 }.getType());
+                Logger.e("参数:" + info.getParams());
+                Logger.e("获取他人的录音列表:" + info.getRetDetail());
+                Logger.e("header:" + info.getHeads());
                 mDataList = bean.getData().getList();
                 mView.getOtherRecordSuccess();
 //                mView.loadMoreItem();

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

@@ -6,6 +6,7 @@ import android.graphics.Outline;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewOutlineProvider;
+import android.widget.Switch;
 import android.widget.Toast;
 
 import com.edufound.reader.R;
@@ -178,6 +179,8 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             @Override
             public void onChildViewDetachedFromWindow(View view) {
                 Jzvd jzvd = view.findViewById(R.id.slidevideo_video);
+                Switch switcss = view.findViewById(R.id.slidevideo_video_switch);
+                switcss.setChecked(false);
                 if (jzvd != null && Jzvd.CURRENT_JZVD != null && jzvd.jzDataSource != null &&
                         jzvd.jzDataSource.containsTheUrl(Jzvd.CURRENT_JZVD.jzDataSource.getCurrentUrl())) {
                     if (Jzvd.CURRENT_JZVD != null && Jzvd.CURRENT_JZVD.screen != Jzvd.SCREEN_FULLSCREEN) {
@@ -355,7 +358,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
 
     @Override
     public void activityDestory() {
-
+        mView.clearRecyclerView();
         mDataList = null;
         mAdapter = null;
         Jzvd.releaseAllVideos();
@@ -446,6 +449,8 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                 player.setVideoCallBack(new RvListJzvdStd.VideoCallBack() {
                     @Override
                     public void onComplete() {
+//                        Runtime.getRuntime().gc();
+                        System.gc();
                         if (mCurrentPosition >= mTotalSize - 1) {
                             //Toast.makeText(mView.getActivity(), "全部播放完成", Toast.LENGTH_SHORT).show();
                             CusToast.getInstance(mView.getActivity()).show("注册失败", 2000);

+ 5 - 2
app/src/main/java/com/edufound/reader/tmailsdk/TMailSDKUtil.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import com.alibaba.ailabs.genie.assistant.sdk.account.UserInfoManager;
@@ -99,9 +100,11 @@ public class TMailSDKUtil {
                                         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("获取是否有权限info.getRetDetail():" + info.getRetDetail());
                                             Logger.e("bean.getData():" + bean.getData());
-                                            Consts.setIsYFVip(true);
+                                            if (!TextUtils.isEmpty(bean.getData())) {
+                                                Consts.setIsYFVip(true);
+                                            }
                                         }
 
                                         @Override

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

@@ -4,6 +4,7 @@ import android.app.Application;
 
 import com.edufound.reader.bean.BaiDuUserInfo;
 import com.edufound.reader.bean.UserBean;
+import com.orhanobut.logger.Logger;
 
 import java.io.File;
 import java.util.Map;

+ 14 - 0
app/src/main/java/com/edufound/reader/util/GlideUtils.java

@@ -1,5 +1,8 @@
 package com.edufound.reader.util;
 
+import static com.bumptech.glide.load.DecodeFormat.PREFER_ARGB_8888;
+import static com.bumptech.glide.load.DecodeFormat.PREFER_RGB_565;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
@@ -19,6 +22,7 @@ import com.edufound.reader.R;
 import java.io.File;
 
 import androidx.annotation.ColorInt;
+
 import io.reactivex.rxjava3.annotations.Nullable;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 import jp.wasabeef.glide.transformations.CropCircleWithBorderTransformation;
@@ -105,6 +109,7 @@ public class GlideUtils {
         RequestOptions options = new RequestOptions()
                 .placeholder(placeholderImage) //占位图
                 .error(errorImage)             //错误图
+                .format(PREFER_RGB_565)
                 .skipMemoryCache(true).diskCacheStrategy(DiskCacheStrategy.NONE);          //禁用掉Glide的内存缓存功能
         Glide.with(context).load(url).apply(options).into(imageView);
 
@@ -135,6 +140,7 @@ public class GlideUtils {
                 .circleCrop()//设置圆形
                 .placeholder(placeholderImage) //占位图
                 .error(errorImage)             //错误图
+                .format(PREFER_RGB_565)
                 .priority(Priority.HIGH);
         Glide.with(context).load(url).apply(options).into(imageView);
     }
@@ -152,7 +158,9 @@ public class GlideUtils {
                 .circleCrop()//设置圆形
                 .placeholder(placeholderImage) //占位图
                 .error(errorImage)             //错误图
+                .format(PREFER_RGB_565)
                 .priority(Priority.HIGH);
+
         Glide.with(context).load(resid).apply(options).into(imageView);
     }
 
@@ -173,6 +181,7 @@ public class GlideUtils {
                         new CropCircleWithBorderTransformation(SizeUtils.px2dp(context, borderSize), borderColor)
                 ))
                 .placeholder(placeholderImage) //占位图
+                .format(PREFER_RGB_565)
                 .error(errorImage);            //错误图
         Glide.with(context).load(url).apply(options).into(imageView);
     }
@@ -194,6 +203,7 @@ public class GlideUtils {
                                 RoundedCornersTransformation.CornerType.ALL)
                 ))
                 .placeholder(placeholderImage) //占位图
+                .format(PREFER_RGB_565)
                 .error(errorImage);            //错误图
         Glide.with(context).load(url).apply(options).into(imageView);
 
@@ -217,6 +227,7 @@ public class GlideUtils {
                         new RoundedCornersTransformation(SizeUtils.px2dp(context, radius), 0, type)
                 ))
                 .placeholder(placeholderImage) //占位图
+                .format(PREFER_RGB_565)
                 .error(errorImage);            //错误图
         Glide.with(context).load(url).apply(options).into(imageView);
     }
@@ -236,6 +247,7 @@ public class GlideUtils {
                         new BlurTransformation(blur)
                 ))
                 .placeholder(placeholderImage) //占位图
+                .format(PREFER_RGB_565)
                 .error(errorImage);            //错误图
         Glide.with(context).load(url).apply(options).into(imageView);
     }
@@ -256,6 +268,7 @@ public class GlideUtils {
                         new BlurTransformation(blur, sampling)
                 ))
                 .placeholder(placeholderImage) //占位图
+                .format(PREFER_RGB_565)
                 .error(errorImage);            //错误图
         Glide.with(context).load(url).apply(options).into(imageView);
     }
@@ -274,6 +287,7 @@ public class GlideUtils {
                         new GrayscaleTransformation()
                 ))
                 .placeholder(placeholderImage) //占位图
+                .format(PREFER_RGB_565)
                 .error(errorImage);            //错误图
         Glide.with(context).load(url).apply(options).into(imageView);
     }

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

@@ -61,7 +61,7 @@ public class OkHttpClient {
             Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
             Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         }
-        OkHttpUtil.getDefault(activity).doGetAsync(info.addHead("uid", Consts.getUID()).build(), new EfunboxCallBack(callback));
+        OkHttpUtil.getDefault(activity).doGetAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doGetAsync(HttpInfo.Builder info, BaseCallback callback) {
@@ -71,14 +71,14 @@ public class OkHttpClient {
             Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
             Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         }
-        OkHttpUtil.getDefault().doGetAsync(info.addHead("uid", Consts.getUID()).build(), new EfunboxCallBack(callback));
+        OkHttpUtil.getDefault().doGetAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build(), new EfunboxCallBack(callback));
     }
 
 
     public static void doPostAsync(@Nullable Activity activity, HttpInfo.Builder info, BaseCallback callback) {
         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));
+        OkHttpUtil.getDefault(activity).doPostAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doPostAsync(HttpInfo.Builder info, BaseCallback callback) {
@@ -86,23 +86,23 @@ public class OkHttpClient {
             Intent intent = new Intent(ShowPageLoadingReceiver.PAGE_LOADING_SHOW);
             Consts.getmApplicAtion().getApplicationContext().sendBroadcast(intent);
         }
-        OkHttpUtil.getDefault().doPostAsync(info.addHead("uid", Consts.getUID()).build(), new EfunboxCallBack(callback));
+        OkHttpUtil.getDefault().doPostAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doPutAsync(Activity activity, HttpInfo.Builder info, BaseCallback callback) {
         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));
+        OkHttpUtil.getDefault(activity).doPutAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doDeleteAsync(Activity activity, HttpInfo.Builder info, BaseCallback callback) {
         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));
+        OkHttpUtil.getDefault(activity).doDeleteAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build(), new EfunboxCallBack(callback));
     }
 
     public static void doUploadFile(Activity activity, HttpInfo.Builder info) {
-        OkHttpUtil.getDefault(activity).doUploadFileAsync(info.addHead("uid", Consts.getUID()).build());
+        OkHttpUtil.getDefault(activity).doUploadFileAsync(info.addHead("uid", Consts.getUID()).addHead("channelCode", Consts.getUmengChannel()).build());
     }
 
 }