Merge remote-tracking branch 'origin/master'

# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java

common/src/main/java/com/yunbao/common/adapter/DrawerTaskAdapter.java

@@ -48,7 +48,7 @@ public class DrawerTaskAdapter extends RecyclerView.Adapter {
 
     @Override
     public int getItemCount() {
-        return child.size();
+        return 2;
     }
 
     public void updateData(List<CustomSidebarChildModel> mChild) {

common/src/main/res/drawable/bg_drawer_popup_task.xml

@@ -9,7 +9,7 @@
     <item android:state_enabled="false">
         <shape>
             <corners android:radius="7dp" />
-            <solid android:color="#2fff" />
+            <solid android:color="#2C2B39" />
         </shape>
     </item>
 </selector>

common/src/main/res/drawable/bg_drawer_popup_task_status2.xml

@@ -3,7 +3,7 @@
     <item>
         <shape>
             <corners android:radius="12.5dp" />
-            <solid android:color="#95FFFFFF" />
+            <solid android:color="#40FFFFFF" />
         </shape>
     </item>
 </selector>

common/src/main/res/layout/view_rights_interests.xml

@@ -28,6 +28,5 @@
         android:id="@+id/child_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
         android:layout_marginBottom="16dp" />
 </LinearLayout>

config.gradle

@@ -25,7 +25,7 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  false
     ]

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

@@ -220,9 +220,9 @@ public class GoogleFragment extends Fragment {
 
                     @Override
                     public void onPayFailed(int code, String msg) {
-
+                        Log.e("谷歌支付",code+msg);
                     }
-                }).checkSku(event.getPostsId())
+                }).checkSku(event.getProductId())
                 ;
                 //下单
                 Bundle params = new Bundle();

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

@@ -7,19 +7,16 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.Dialog;
 import android.app.NotificationChannel;
 import android.app.PendingIntent;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Display;
@@ -32,9 +29,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 import androidx.viewpager.widget.ViewPager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -70,6 +64,7 @@ import com.yunbao.common.dialog.HintDialog;
 import com.yunbao.common.dialog.InstructorOperationDialog;
 import com.yunbao.common.event.InstructorOperationEvent;
 import com.yunbao.common.event.LiveFloatEvent;
+import com.yunbao.common.event.MainHomeCommunityToChatEvent;
 import com.yunbao.common.event.MessageIMEvent;
 import com.yunbao.common.event.NoviceInstructorEvent;
 import com.yunbao.common.event.RongIMConnectionStatusEvent;
@@ -106,7 +101,6 @@ import com.yunbao.main.R;
 import com.yunbao.main.dialog.MainStartDialogFragment;
 import com.yunbao.main.dialog.ReturnUserDialog;
 import com.yunbao.main.dialog.SigninDialog;
-import com.yunbao.common.event.MainHomeCommunityToChatEvent;
 import com.yunbao.main.event.PDLiveConversationListEvent;
 import com.yunbao.main.http.MainHttpConsts;
 import com.yunbao.main.http.MainHttpUtil;
@@ -488,7 +482,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        Log.i("权限","requestCode = " + requestCode + ", permissions = " + Arrays.deepToString(permissions) + ", grantResults = " + Arrays.toString(grantResults));
+        Log.i("权限", "requestCode = " + requestCode + ", permissions = " + Arrays.deepToString(permissions) + ", grantResults = " + Arrays.toString(grantResults));
     }
 
     @Override
@@ -935,6 +929,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             if (IMLoginManager.get(mContext).isisNewUserOne() == false) {
                 //getD(); //取消在首页下载礼物svga操作
             }
+        } else if (TextUtils.equals(str, "isCloseNavigation")) {
+            isTabClose = false;
+            rt_main_tab.setVisibility(View.VISIBLE);
         }
     }
 

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

@@ -439,6 +439,7 @@ public class MyWebViewActivity extends AbsActivity {
         Constants.mStream = "";
         Constants.chatActionUrl = "";
         indexInto = 0;
+        EventBus.getDefault().post("isCloseNavigation");
         super.onDestroy();
     }