Merge branch 'master' into google

wjc

2 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

 app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java

@@ -10,7 +10,8 @@
public class AppConfigManage {

    /*********是否正式服务器*********/
    private static boolean isOnlineServer = UserConfigManage.getInstance().isOnlineServer();
//    private static boolean isOnlineServer = UserConfigManage.getInstance().isOnlineServer();
    private static boolean isOnlineServer = true;
    /*********正式环境*********/
    private static final String APP_KEY_ONLINE = "CSZEMDJL";
    private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";