Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-13 3d49dbbd9a5e15d14fc0a4388b17c19c0ac2e5f7

 karma.conf.js

@@ -28,6 +28,7 @@
    logLevel: config.LOG_INFO,
    autoWatch: true,
    browsers: ['Chrome'],
    singleRun: false
    singleRun: false,
    browserNoActivityTimeout: 60000 
  });
};