修改扫http链接跳转浏览器

README.md

@@ -1,5 +1,9 @@
 MM基于云信IM UIKIT
 
+MM 有置顶世界聊天，只能+86号登录注册，群有积分红包，私聊有积分赠送，积分红包，
+开关(transfer_score,redpkg_score)和积分费率参数(mmSilverFeeRate)不一样
+
+
 云信 IM UIKit 是基于网易云信 IM SDK 开发的一款即时通讯 UI 组件库，包括聊天、会话、圈组、搜索、群管理等组件。通过 IM UIKit，可快速集成包含 UI 界面的即时通讯应用。
 
 IM UIKit 简化了基于 NIM SDK 的应用开发过程。它不仅能助您快速实现 UI 功能，也支持调用 NIM SDK 相应的接口实现即时通讯业务逻辑和数据处理。因此，您在使用 IM UIKit

app/src/main/java/com/dskj/rbchat/main/MainActivity.java

@@ -18,6 +18,7 @@ import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -25,6 +26,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -44,6 +47,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
+import androidx.core.app.ServiceCompat;
 import androidx.core.view.WindowCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
@@ -57,6 +61,7 @@ import com.dskj.rbchat.AppSkinConfig;
 import com.dskj.rbchat.CustomConfig;
 import com.dskj.rbchat.IMApplication;
 import com.dskj.rbchat.IMUIKitConfig;
+import com.dskj.rbchat.NotificationMsgService;
 import com.dskj.rbchat.R;
 import com.dskj.rbchat.adapter.CommonAdapter;
 import com.dskj.rbchat.adapter.ViewHolder;
@@ -336,6 +341,7 @@ public class MainActivity extends BaseActivity {
                     .setAutoCancel(true)
                     .setPriority(NotificationCompat.PRIORITY_HIGH);
             notificationManager.notify(0, builder.build());
+
         }
 
     }
@@ -361,6 +367,7 @@ public class MainActivity extends BaseActivity {
 
     private SettingNotifyViewModel notifyViewModel;
     private Subscription mEventSubscription;
+    Intent notifyService;
 
     @SuppressLint("NewApi")
     @Override
@@ -380,7 +387,6 @@ public class MainActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         ALog.d(Constant.PROJECT_TAG, "MainActivity:onCreate");
         notifyViewModel = new ViewModelProvider(this).get(SettingNotifyViewModel.class);
-//        IMApplication.isShowPushDetails = notifyViewModel.getPushShowNoDetail();
         if (TextUtils.isEmpty(IMKitClient.account())) {
             Intent intent = new Intent(this, WelcomeActivity.class);
             startActivity(intent);
@@ -400,12 +406,11 @@ public class MainActivity extends BaseActivity {
         ChatDataUtils.set(this, ChatKitUIConstant.SERVICES_LOGIN, false);
         ChatKitUIConstant.isSendGiftRedPacket = DataUtils.getIsSendGiftRedPacket();
         initView();
-
+        getServiceId();
 
         ChatObserverRepo.registerReceiveMessageObserve(receiveMessageObserver);
-       // EventCenter.registerEventNotify(skinNotify);
+//        EventCenter.registerEventNotify(skinNotify);
         initNotifications();
-        getServiceId();
         setConfig();
         getWallet();
         getConfig();
@@ -481,7 +486,6 @@ public class MainActivity extends BaseActivity {
                     }
                 });
 
-
     }
 
     public int getNavigationBarHeight(Context context) {
@@ -490,28 +494,11 @@ public class MainActivity extends BaseActivity {
         return resources.getDimensionPixelSize(resourceId);
     }
 
-    private static final String TAG = "MainActivity";
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        setIntent(intent);
-        IMMessage message = (IMMessage) intent.getSerializableExtra("message");
-        if (message != null) {
-            if (message.getSessionType() == SessionTypeEnum.SUPER_TEAM || message.getSessionType() == SessionTypeEnum.Team) {
-                Team team = NIMClient.getService(TeamService.class).queryTeamBlock(message.getSessionId());
-                XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
-                        .withParam(RouterConstant.CHAT_KRY, team)
-                        .withContext(this)
-                        .navigate();
-            } else if (message.getSessionType() == SessionTypeEnum.P2P) {
-                XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_P2P_PAGE)
-                        .withParam(RouterConstant.CHAT_ID_KRY, message.getSessionId() + "")
-                        .withContext(this)
-                        .navigate();
-            }
-        }
         LogUtils.i("111111111111111110ZZZZZZZZYYYYYYYYY:" + IMApplication.schemeUserId);
+
         gotoSheme();
 
     }
@@ -575,7 +562,6 @@ public class MainActivity extends BaseActivity {
 
     }
 
-
     private void initRing() {
     }
 
@@ -700,16 +686,13 @@ public class MainActivity extends BaseActivity {
         ALog.d(Constant.PROJECT_TAG, "MainActivity:initView");
         loadConfig();
         List<Fragment> fragments = new ArrayList<>();
-        shareDateUtils = new ShareDateUtils();
+        //  index2Fragment = new HomeFragment();
-        shareDateUtils.getAllSessionList();
-        shareDateUtils.getLocFriends();
-        index2Fragment = new HomeFragment();
         chatTabFragment = new ChatTabFragment();
-        voomFragment = new VoomFragment();
+        //  voomFragment = new VoomFragment();
         walletFragment = new MineFragment();
-        fragments.add(index2Fragment);
+        // fragments.add(index2Fragment);
         fragments.add(chatTabFragment);
-        fragments.add(voomFragment);
+        // fragments.add(voomFragment);
         fragments.add(walletFragment);
 
         fragmentAdapter = new FragmentAdapter(this);
@@ -718,9 +701,12 @@ public class MainActivity extends BaseActivity {
         activityMainBinding.viewPager.setAdapter(fragmentAdapter);
         activityMainBinding.viewPager.setCurrentItem(START_INDEX, false);
         activityMainBinding.viewPager.setOffscreenPageLimit(fragments.size());
-        mCurrentTab = activityMainBinding.conversationBtnGroup;
+        mCurrentTab = activityMainBinding.contactBtnGroup;
         resetTabSkin(isCommonSkin);
         checkZhiWen();
+        shareDateUtils = new ShareDateUtils();
+        shareDateUtils.getAllSessionList();
+        shareDateUtils.getLocFriends();
     }
 
     private void checkZhiWen() {
@@ -899,7 +885,10 @@ public class MainActivity extends BaseActivity {
                                     if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
                                         sendMachine(scheme);
                                     } else {
-                                        showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+//                                        showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+                                        Intent intentweb = new Intent(Intent.ACTION_VIEW);
+                                        intentweb.setData(Uri.parse(scheme));
+                                        startActivity(intentweb);
                                     }
                                 } else {
                                     showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
@@ -907,11 +896,14 @@ public class MainActivity extends BaseActivity {
                                 break;
                         }
                     } else {
-                        if (scheme.startsWith("http")) {
+                        if (scheme.startsWith("http")) { //是http連接
                             if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
                                 sendMachine(scheme);
                             } else {
-                                showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+                                // showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+                                Intent intent = new Intent(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse(scheme));
+                                startActivity(intent);
                             }
                         } else {
                             showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
@@ -1447,6 +1439,7 @@ public class MainActivity extends BaseActivity {
         if (mEventSubscription != null) {
             mEventSubscription.unsubscribe();
         }
+        //  stopService(notifyService);
         super.onDestroy();
     }
 
@@ -1464,7 +1457,7 @@ public class MainActivity extends BaseActivity {
     @SuppressLint("UseCompatLoadingForDrawables")
     private void resetTabSkin(boolean isCommonSkin) {
         if (mCurrentTab == activityMainBinding.contactBtnGroup) {
-            activityMainBinding.viewPager.setCurrentItem(1, false);
+            activityMainBinding.viewPager.setCurrentItem(0, false);
             activityMainBinding.contact.setTextColor(
                     getResources().getColor(R.color.color_fe6881));
             activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
@@ -1478,7 +1471,7 @@ public class MainActivity extends BaseActivity {
                     null, getResources().getDrawable(R.mipmap.voom_img_t), null, null);
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
         } else if (mCurrentTab == activityMainBinding.myselfBtnGroup) {
-            activityMainBinding.viewPager.setCurrentItem(3, false);
+            activityMainBinding.viewPager.setCurrentItem(1, false);
             activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
             activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
                     null, getResources().getDrawable(R.mipmap.wo_t), null, null);
@@ -1492,6 +1485,35 @@ public class MainActivity extends BaseActivity {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
 
         }
+//        if (mCurrentTab == activityMainBinding.contactBtnGroup) {
+//            activityMainBinding.viewPager.setCurrentItem(1, false);
+//            activityMainBinding.contact.setTextColor(
+//                    getResources().getColor(R.color.color_fe6881));
+//            activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
+//                    null, getResources().getDrawable(R.mipmap.chat_img_t), null, null);
+//            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+//        } else if (mCurrentTab == activityMainBinding.liveBtnGroup) {
+//            activityMainBinding.viewPager.setCurrentItem(2, false);
+//            activityMainBinding.live.setTextColor(
+//                    getResources().getColor(R.color.color_fe6881));
+//            activityMainBinding.live.setCompoundDrawablesWithIntrinsicBounds(
+//                    null, getResources().getDrawable(R.mipmap.voom_img_t), null, null);
+//            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+//        } else if (mCurrentTab == activityMainBinding.myselfBtnGroup) {
+//            activityMainBinding.viewPager.setCurrentItem(3, false);
+//            activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
+//            activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
+//                    null, getResources().getDrawable(R.mipmap.wo_t), null, null);
+//            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+//        } else if (mCurrentTab == activityMainBinding.conversationBtnGroup) {
+//            activityMainBinding.viewPager.setCurrentItem(0, false);
+//            activityMainBinding.conversation.setTextColor(
+//                    getResources().getColor(R.color.color_fe6881));
+//            activityMainBinding.conversation.setCompoundDrawablesWithIntrinsicBounds(
+//                    null, getResources().getDrawable(R.mipmap.index_img_t), null, null);
+//            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+//
+//        }
     }
 
 
@@ -1885,11 +1907,17 @@ public class MainActivity extends BaseActivity {
 
                         if (feedbackResp.data != null && feedbackResp.data.size() > 0) {
                             for (ConfigBean configBean : feedbackResp.data) {
-                                if (configBean.getId() == 1) {
+//                                if (configBean.getId() == 1) {
-                                    DataUtils.set(MainActivity.this, "transfer_cash", configBean.getVal().equals("1"));
+//                                    DataUtils.set(MainActivity.this, "transfer_cash", configBean.getVal().equals("1"));
+//                                }
+//                                if (configBean.getId() == 2) {
+//                                    DataUtils.set(MainActivity.this, "transfer_jifen", configBean.getVal().equals("1"));
+//                                }
+                                if (configBean.getId() == 3) {
+                                    DataUtils.set(MainActivity.this, "transfer_score", configBean.getVal().equals("1"));
                                 }
-                                if (configBean.getId() == 2) {
+                                if (configBean.getId() == 4) {
-                                    DataUtils.set(MainActivity.this, "transfer_jifen", configBean.getVal().equals("1"));
+                                    DataUtils.set(MainActivity.this, "redpkg_score", configBean.getVal().equals("1"));
                                 }
                             }
 

app/src/main/java/com/dskj/rbchat/main/index/add/AddFriendsActivity.java

@@ -596,8 +596,11 @@ public class AddFriendsActivity extends LllChatBaseActivity {
                                     if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
                                         sendMachine(scheme);
                                     } else {
+                                        Intent intentweb = new Intent(Intent.ACTION_VIEW);
+                                        intentweb.setData(Uri.parse(scheme));
+                                        startActivity(intentweb);
 //                                    activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
-                                        showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+//                                        showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
 
                                     }
                                 } else {
@@ -613,8 +616,10 @@ public class AddFriendsActivity extends LllChatBaseActivity {
                                 sendMachine(scheme);
                             } else {
 //                            activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
-                                showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+//                                showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
-
+                                Intent intentweb = new Intent(Intent.ACTION_VIEW);
+                                intentweb.setData(Uri.parse(scheme));
+                                startActivity(intentweb);
                             }
                         } else {
 //                        ToastX.showLongToast(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));

app/src/main/java/com/dskj/rbchat/main/mine/UserInfoActivity.java

@@ -383,8 +383,10 @@ public class UserInfoActivity extends BaseActivity {
                                         sendMachine(scheme);
                                     } else {
 //                                    activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
-                                        showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
+//                                        showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
-
+                                        Intent intentweb = new Intent(Intent.ACTION_VIEW);
+                                        intentweb.setData(Uri.parse(scheme));
+                                        startActivity(intentweb);
                                     }
                                 } else {
 //                                ToastX.showLongToast(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java

@@ -49,12 +49,12 @@ public interface ApiService {
     /**
      * 正式环境
      */
-     String URL = "https://api.letschat2023.com/";
+//     String URL = "https://api.letschat2023.com/";
 
     /**
      * 测试环境
      */
-//    String URL = "https://api-test.letschat2023.com/";
+    String URL = "https://api-test.letschat2023.com/";
     //  String URL = "https://8.217.244.135:8001/";