update config

Author: imndx

chat/src/main/java/cn/wildfire/chat/app/MyApp.java

@@ -18,17 +18,23 @@
 
 public class MyApp extends BaseApp {
 
+
+    // 一定记得替换为你们自己的，ID请从BUGLY官网申请。关于BUGLY，可以从BUGLY官网了解，或者百度。
+    public static String BUGLY_ID = "34490ba79f";
+
     @Override
     public void onCreate() {
         super.onCreate();
         Config.validateConfig();
 
         // bugly，务必替换为你自己的!!!
         if ("wildfirechat.cn".equals(Config.IM_SERVER_HOST)) {
-            CrashReport.initCrashReport(getApplicationContext(), Config.BUGLY_ID, false);
+            CrashReport.initCrashReport(getApplicationContext(), BUGLY_ID, false);
         }
         // 只在主进程初始化，否则会导致重复收到消息
         if (getCurProcessName(this).equals(BuildConfig.APPLICATION_ID)) {
+            // 如果uikit是以aar的方式引入 ，那么需要在此对Config里面的属性进行配置，如：
+            // Config.IM_SERVER_HOST = "im.example.com";
             WfcUIKit wfcUIKit = WfcUIKit.getWfcUIKit();
             wfcUIKit.init(this);
             wfcUIKit.setAppServiceProvider(AppService.Instance());
@@ -62,10 +68,10 @@ public static String getCurProcessName(Context context) {
         int pid = android.os.Process.myPid();
 
         ActivityManager activityManager = (ActivityManager) context
-                .getSystemService(Context.ACTIVITY_SERVICE);
+            .getSystemService(Context.ACTIVITY_SERVICE);
 
         for (ActivityManager.RunningAppProcessInfo appProcess : activityManager
-                .getRunningAppProcesses()) {
+            .getRunningAppProcesses()) {
 
             if (appProcess.pid == pid) {
                 return appProcess.processName;

uikit/src/main/java/cn/wildfire/chat/kit/Config.java

@@ -2,57 +2,48 @@
 
 import android.os.Environment;
 import android.text.TextUtils;
-import android.util.Log;
 
 /**
  * Created by heavyrain lee on 2017/11/24.
  */
 
-public interface Config {
+public class Config {
 
     // 仅仅是host，没有http开头，不可配置为127.0.0.1 或者 192.168.0.1
     // 可以是IP，可以是域名，如果是域名的话只支持主域名或www域名或im的二级域名，其它二级域名不支持！建议使用域名。
     // 例如：example.com或www.example.com或im.example.com是支持的；xx.example.com或xx.yy.example.com是不支持的。
-    String IM_SERVER_HOST = "wildfirechat.cn";
+    public static String IM_SERVER_HOST = "wildfirechat.cn";
 
     // App Server默认使用的是8888端口，替换为自己部署的服务时需要注意端口别填错了
     // 正式商用时，建议用https，确保token安全
-    String APP_SERVER_ADDRESS = "http://wildfirechat.cn:8888";
+    public static String APP_SERVER_ADDRESS = "http://wildfirechat.cn:8888";
 
-    String ICE_ADDRESS = "turn:turn.wildfirechat.cn:3478";
-    String ICE_ADDRESS2 = "turn:117.51.153.82:3478";
-    String ICE_USERNAME = "wfchat";
-    String ICE_PASSWORD = "wfchat";
+    public static String ICE_ADDRESS = "turn:turn.wildfirechat.cn:3478";
+    public static String ICE_ADDRESS2 = "turn:117.51.153.82:3478";
+    public static String ICE_USERNAME = "wfchat";
+    public static String ICE_PASSWORD = "wfchat";
 
-    // 一定记得替换为你们自己的，ID请从BUGLY官网申请。关于BUGLY，可以从BUGLY官网了解，或者百度。
-    String BUGLY_ID = "34490ba79f";
-
-    int DEFAULT_MAX_AUDIO_RECORD_TIME_SECOND = 120;
+    public static int DEFAULT_MAX_AUDIO_RECORD_TIME_SECOND = 120;
 
     // 支持多人音视频时有效
-    int MAX_VIDEO_PARTICIPANT_COUNT = 4;
-    int MAX_AUDIO_PARTICIPANT_COUNT = 9;
+    public static int MAX_VIDEO_PARTICIPANT_COUNT = 4;
+    public static int MAX_AUDIO_PARTICIPANT_COUNT = 9;
 
-    String VIDEO_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/video";
-    String AUDIO_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/audio";
-    String PHOTO_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/photo";
-    String FILE_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/file";
+    public static String VIDEO_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/video";
+    public static String AUDIO_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/audio";
+    public static String PHOTO_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/photo";
+    public static String FILE_SAVE_DIR = Environment.getExternalStorageDirectory().getPath() + "/wfc/file";
 
-    static void validateConfig() {
+    public static void validateConfig() {
         if (TextUtils.isEmpty(IM_SERVER_HOST)
-                || IM_SERVER_HOST.startsWith("http")
-                || TextUtils.isEmpty(APP_SERVER_ADDRESS)
-                || (!APP_SERVER_ADDRESS.startsWith("http") && !APP_SERVER_ADDRESS.startsWith("https"))
-                || IM_SERVER_HOST.equals("127.0.0.1")
-                || APP_SERVER_ADDRESS.contains("127.0.0.1")
+            || IM_SERVER_HOST.startsWith("http")
+            || TextUtils.isEmpty(APP_SERVER_ADDRESS)
+            || (!APP_SERVER_ADDRESS.startsWith("http") && !APP_SERVER_ADDRESS.startsWith("https"))
+            || IM_SERVER_HOST.equals("127.0.0.1")
+            || APP_SERVER_ADDRESS.contains("127.0.0.1")
         ) {
             throw new IllegalStateException("im server host config error");
         }
 
-        if (!IM_SERVER_HOST.equals("wildfirechat.cn")) {
-            if ("34490ba79f".equals(BUGLY_ID)) {
-                Log.e("wfc config", "二次开发一定需要将buglyId替换为自己的!!!!1");
-            }
-        }
     }
 }