Commit 2e25dd96 by 王文龙

[add]添加环境配置切换

parent 4c9ec549
...@@ -94,7 +94,7 @@ dependencies { ...@@ -94,7 +94,7 @@ dependencies {
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'
implementation("com.offcn.live:titleview:1.1.0-s1") implementation("com.offcn.live:titleview:1.1.0-s1")
implementation("com.offcn.live:imsdk-kit:1.0.0.30") implementation("com.offcn.live:imsdk-kit:1.0.0.31")
// DB // DB
implementation 'org.greenrobot:greendao:3.2.2' implementation 'org.greenrobot:greendao:3.2.2'
......
...@@ -23,6 +23,8 @@ import androidx.multidex.MultiDexApplication; ...@@ -23,6 +23,8 @@ import androidx.multidex.MultiDexApplication;
public class MyApp extends MultiDexApplication { public class MyApp extends MultiDexApplication {
private static final String TAG = MyApp.class.getSimpleName(); private static final String TAG = MyApp.class.getSimpleName();
private boolean mEnvIsTest = true;
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
...@@ -33,13 +35,14 @@ public class MyApp extends MultiDexApplication { ...@@ -33,13 +35,14 @@ public class MyApp extends MultiDexApplication {
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
Constants.ENV_IS_TEST = mEnvIsTest;
// 初始化 OIMSDK // 初始化 OIMSDK
initOIMSDK(); initOIMSDK();
} }
private void initOIMSDK() { private void initOIMSDK() {
UserBeanDaoManager.getInstance().init(this); UserBeanDaoManager.getInstance().init(this);
OIMSDK.init(this, true); OIMSDK.init(this, mEnvIsTest);
ZGLLogUtils.setLogEnabled(true); ZGLLogUtils.setLogEnabled(true);
OIMSDK.getInstance().setOnUnreadMsgCountChangedListener(new OIMCallback.OnUnreadMsgCountChangedListener() { OIMSDK.getInstance().setOnUnreadMsgCountChangedListener(new OIMCallback.OnUnreadMsgCountChangedListener() {
@Override @Override
......
...@@ -259,7 +259,7 @@ public class ContactListFragment extends BaseFragment { ...@@ -259,7 +259,7 @@ public class ContactListFragment extends BaseFragment {
jsonObject.put("im_token", LoginManager.getToken(getActivity())); jsonObject.put("im_token", LoginManager.getToken(getActivity()));
RequestQueue requestQueue = Volley.newRequestQueue(getActivity()); RequestQueue requestQueue = Volley.newRequestQueue(getActivity());
JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, "http://api.study.t.eoffcn.com/web/v2/im/userlist", jsonObject, JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, Utils.getServerContactUrl(), jsonObject,
new Response.Listener<JSONObject>() { new Response.Listener<JSONObject>() {
@Override @Override
public void onResponse(JSONObject response) { public void onResponse(JSONObject response) {
......
...@@ -21,6 +21,7 @@ import com.jyall.base.util.ValidateUtils; ...@@ -21,6 +21,7 @@ import com.jyall.base.util.ValidateUtils;
import com.offcn.imclient.R; import com.offcn.imclient.R;
import com.offcn.imclient.bean.UserBean; import com.offcn.imclient.bean.UserBean;
import com.offcn.imclient.util.LoginManager; import com.offcn.imclient.util.LoginManager;
import com.offcn.imclient.util.Utils;
import com.offcn.live.im.util.ZGLLogUtils; import com.offcn.live.im.util.ZGLLogUtils;
import com.offcn.live.im.util.ZGLParseUtils; import com.offcn.live.im.util.ZGLParseUtils;
...@@ -110,7 +111,7 @@ public class LoginActivity extends BaseActivity { ...@@ -110,7 +111,7 @@ public class LoginActivity extends BaseActivity {
jsonObject.put("password", pwd); jsonObject.put("password", pwd);
RequestQueue requestQueue = Volley.newRequestQueue(this); RequestQueue requestQueue = Volley.newRequestQueue(this);
JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, "http://api.study.t.eoffcn.com/web/v2/im/login", jsonObject, JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, Utils.getServerLoginUrl(), jsonObject,
new Response.Listener<JSONObject>() { new Response.Listener<JSONObject>() {
@Override @Override
public void onResponse(JSONObject response) { public void onResponse(JSONObject response) {
......
...@@ -2,6 +2,8 @@ package com.offcn.imclient.util; ...@@ -2,6 +2,8 @@ package com.offcn.imclient.util;
public class Constants { public class Constants {
public static boolean ENV_IS_TEST = true;
public static class EventCode { public static class EventCode {
public static final int Code_Count_Changed = 1; public static final int Code_Count_Changed = 1;
public static final int Code_New_Msg = 2; public static final int Code_New_Msg = 2;
......
...@@ -6,11 +6,31 @@ import com.offcn.imclient.bean.UserBean; ...@@ -6,11 +6,31 @@ import com.offcn.imclient.bean.UserBean;
import com.offcn.live.im.OIMSDK; import com.offcn.live.im.OIMSDK;
public class Utils { public class Utils {
/**
public static void logout(Context context){ * 退出登录,销毁
*
* @param context
*/
public static void logout(Context context) {
OIMSDK.getInstance().destroy(); OIMSDK.getInstance().destroy();
LoginManager.logout(context); LoginManager.logout(context);
UserBeanDaoManager.getInstance().deleteAll(); UserBeanDaoManager.getInstance().deleteAll();
} }
public static String getServerLoginUrl() {
if (Constants.ENV_IS_TEST) {
return "http://api.study.t.eoffcn.com/web/v2/im/login";
} else {
return "http://api.study.eoffcn.com/web/v2/im/login";
}
}
public static String getServerContactUrl() {
if (Constants.ENV_IS_TEST) {
return "http://api.study.t.eoffcn.com/web/v2/im/userlist";
} else {
return "http://api.study.eoffcn.com/web/v2/im/userlist";
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment