Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

        <meta-data
            android:name="com.baidu.lbsapi.API_KEY"
            android:value="qmitBFE5Am7H53UVylGwG6b0" />
        打包
        <!-- android:value="Zl49XczhF1ZFHSWFyBEnGYVz" />开发 -->