提交 6a09b896 authored 作者: 吴强's avatar 吴强

对某些依赖等进行了升级

上级 0d9e986a
...@@ -170,7 +170,7 @@ dependencies { ...@@ -170,7 +170,7 @@ dependencies {
compile project(':react-native-code-push') compile project(':react-native-code-push')
compile project(':react-native-device-info') compile project(':react-native-device-info')
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:25.4.0" compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:multidex:1.0.1'
compile "com.facebook.react:react-native:+" // From node_modules compile "com.facebook.react:react-native:+" // From node_modules
compile project(':react-native-vector-icons') // 2017-10-31 wq add compile project(':react-native-vector-icons') // 2017-10-31 wq add
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools ="http://schemas.android.com/tools"
package="com.bolanmanagerapp" package="com.bolanmanagerapp"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0"
>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.BLUETOOTH"/> <uses-permission android:name="android.permission.BLUETOOTH"/>
...@@ -12,7 +13,6 @@ ...@@ -12,7 +13,6 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-sdk <uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="22" /> android:targetSdkVersion="22" />
<application <application
...@@ -20,9 +20,16 @@ ...@@ -20,9 +20,16 @@
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme"
>
<meta-data
tools:replace="android:value"
android:name="android.support.VERSION"
android:value="26.1.0" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
......
...@@ -7,9 +7,10 @@ buildscript { ...@@ -7,9 +7,10 @@ buildscript {
url 'https://maven.google.com/' url 'https://maven.google.com/'
name 'Google' name 'Google'
} }
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.3.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
#Fri Jan 18 11:39:12 CST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -85,10 +85,10 @@ export function parseObject(response, { ...@@ -85,10 +85,10 @@ export function parseObject(response, {
return response.json() return response.json()
.then((json) => { .then((json) => {
if (json.errorCode === 0) { if (json.errorCode === 0) {
let { data } = json; if (_.isObjectLike(json)) {
if (_.isObjectLike(data)) { json = new Resolver(json).resolve();
data = new Resolver(json.data).resolve();
} }
const { data } = json;
return needMap ? mapValue(data) : data; return needMap ? mapValue(data) : data;
} else { } else {
throw new Error(json.message); throw new Error(json.message);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论