From e8f13d75901e66822f0c96d288525c178be7ebc1 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 18 Nov 2022 15:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/adapter/DrawerTaskAdapter.java | 2 +- .../main/res/drawable/bg_drawer_popup_task.xml | 2 +- .../drawable/bg_drawer_popup_task_status2.xml | 2 +- .../main/res/layout/view_rights_interests.xml | 1 - config.gradle | 2 +- .../yunbao/main/activity/GoogleFragment.java | 4 ++-- .../com/yunbao/main/activity/MainActivity.java | 17 +++++++---------- .../yunbao/main/activity/MyWebViewActivity.java | 1 + 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/adapter/DrawerTaskAdapter.java b/common/src/main/java/com/yunbao/common/adapter/DrawerTaskAdapter.java index ad6590af4..d3b0acc79 100644 --- a/common/src/main/java/com/yunbao/common/adapter/DrawerTaskAdapter.java +++ b/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 mChild) { diff --git a/common/src/main/res/drawable/bg_drawer_popup_task.xml b/common/src/main/res/drawable/bg_drawer_popup_task.xml index 89c5d1df6..d65206a12 100644 --- a/common/src/main/res/drawable/bg_drawer_popup_task.xml +++ b/common/src/main/res/drawable/bg_drawer_popup_task.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/common/src/main/res/drawable/bg_drawer_popup_task_status2.xml b/common/src/main/res/drawable/bg_drawer_popup_task_status2.xml index 2235f5708..5b9553788 100644 --- a/common/src/main/res/drawable/bg_drawer_popup_task_status2.xml +++ b/common/src/main/res/drawable/bg_drawer_popup_task_status2.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/common/src/main/res/layout/view_rights_interests.xml b/common/src/main/res/layout/view_rights_interests.xml index 002af5892..ab58e5fdc 100644 --- a/common/src/main/res/layout/view_rights_interests.xml +++ b/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" /> \ No newline at end of file diff --git a/config.gradle b/config.gradle index 8affa5db3..c7985d37c 100644 --- a/config.gradle +++ b/config.gradle @@ -25,7 +25,7 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : false, + isGooglePlay : true, //是否上报异常日志 isUploadLog : false ] diff --git a/main/src/main/java/com/yunbao/main/activity/GoogleFragment.java b/main/src/main/java/com/yunbao/main/activity/GoogleFragment.java index d8cf5d347..46329371f 100644 --- a/main/src/main/java/com/yunbao/main/activity/GoogleFragment.java +++ b/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(); diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index d79039bf8..a61ca09ca 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/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; @@ -483,9 +477,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene //获取指导员账号 ConversationIMListManager.get(this).getUserInstructor(this); checkVersion(); - if(!SpUtil.getInstance().getBooleanValue("NOTIFICATION")){ + if (!SpUtil.getInstance().getBooleanValue("NOTIFICATION")) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - this.requestPermissions(new String[]{Manifest.permission.ACCESS_NOTIFICATION_POLICY,Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE}, 233); + this.requestPermissions(new String[]{Manifest.permission.ACCESS_NOTIFICATION_POLICY, Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE}, 233); } DialogUitl.showSimpleDialog(this, "应用需要通知权限", new DialogUitl.SimpleCallback() { @Override @@ -505,7 +499,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 @@ -952,6 +946,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); } } diff --git a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java b/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java index 958e286d0..dc4157cc8 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java +++ b/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(); }