Commit b0bddad4dbc772246a33b39c16adf110c0ece4d9
Exists in
yxb_dev
and in
2 other branches
Merge branch 'developer' into yxb_dev
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
.idea/misc.xml
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | </value> |
| 25 | 25 | </option> |
| 26 | 26 | </component> |
| 27 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 27 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 28 | 28 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 29 | 29 | </component> |
| 30 | 30 | <component name="ProjectType"> | ... | ... |
app/src/main/java/com/shunzhi/parent/AppConfig.java
| ... | ... | @@ -22,8 +22,8 @@ public class AppConfig { |
| 22 | 22 | public static String USER_SEX = "user_sex"; |
| 23 | 23 | public static String USER_IMAGE = "user_image"; |
| 24 | 24 | public static String PARENT_ID = "parent_id"; |
| 25 | - public static String NIM_CONFIG_VIBRATE = "nim_config_vibrate"; | |
| 26 | - public static String NIM_CONFIG_SOUND = "nim_config_sound"; | |
| 25 | + public static String NIM_CONFIG_VIBRATE = "nim_config_vibrate";//收到通知震动 | |
| 26 | + public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃 | |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | public static boolean ISLOGIN = false; | ... | ... |