Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
e3478875
Commit
e3478875
authored
Sep 25, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_im' of
http://113.105.137.151:22280/lify/rvapp
into master-video
parents
bc69266d
10d35630
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
AppConfig.java
plugin_im/src/main/java/com/rv/im/AppConfig.java
+2
-1
No files found.
plugin_im/src/main/java/com/rv/im/AppConfig.java
View file @
e3478875
...
@@ -5,6 +5,7 @@ import android.util.Log;
...
@@ -5,6 +5,7 @@ import android.util.Log;
import
com.rv.im.bean.ImConfig
;
import
com.rv.im.bean.ImConfig
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
com.frame.rv.config.RvFrameConfig
;
public
class
AppConfig
implements
Serializable
{
public
class
AppConfig
implements
Serializable
{
...
@@ -19,7 +20,7 @@ public class AppConfig implements Serializable {
...
@@ -19,7 +20,7 @@ public class AppConfig implements Serializable {
// 改服务器时要同时改默认配置assets/default_config和AppConfig.apiKey,
// 改服务器时要同时改默认配置assets/default_config和AppConfig.apiKey,
/* 请求配置的接口 */
/* 请求配置的接口 */
//public static String CONFIG_URL = "http://192.168.0.168:8092/config";
//public static String CONFIG_URL = "http://192.168.0.168:8092/config";
public
static
String
CONFIG_URL
=
"https://xxfcim.upyuns.com/xxfcim
/config"
;
public
static
String
CONFIG_URL
=
RvFrameConfig
.
IMA_BASEUSRL
+
"
/config"
;
public
static
boolean
IS_OPEN_RECEIPT
=
true
;
public
static
boolean
IS_OPEN_RECEIPT
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment