Merge branch 'master' of ssh://192.168.1.116:29418/bolan-root/frontend/manager-app-sz into wq

android/app/build.gradle

@@ -111,7 +111,7 @@ android {
         targetSdkVersion 25
         multiDexEnabled true
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.2"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

src/models/houseinfo/listhouse.js

@@ -53,7 +53,11 @@ export default {
         datasourceName: 'QueryfwTable',
       };
       const result = yield call(getData, coordinate, { pst: size, psz: 10, params: { pFWDiZhi } });
+      console.info('result');
+      console.info(result);
       const meta = yield call(getMeta, coordinate);
+      console.info('meta');
+      console.info(meta);
       yield put({ type: 'setMetas', payload: meta });
       for (const row of result) {
         yield put({ type: 'addHouse', payload: row });

src/models/welcome.js

@@ -2,6 +2,9 @@ import { AsyncStorage } from 'react-native';
 import { NavigationActions } from 'react-navigation';
 // import codePush from 'react-native-code-push';
 import { checkUpdate } from '../services/update';
+import { update } from '../native/Updater';
+import config from '../utils/config';
+import { encrypt } from '../utils/helper';
 
 export default {
   namespace: 'welcome',
@@ -11,8 +14,14 @@ export default {
     *init(ignored, { put, call }) {
       try {
         // yield call(codePush.sync);
-        const promise = yield call(checkUpdate);
-        console.info(promise);
+        const result = yield call(checkUpdate);
+        const { action, deploymentInfo, tokenId } = result;
+        if (action === 'update') {
+          const token = encrypt(tokenId);
+          console.info(update);
+          // console.info(`${config.updateContextPath}/resource/${token}/${encodeURIComponent(deploymentInfo.uri)}`);
+          yield call(update, `${config.updateContextPath}/resource/${token}/${encodeURIComponent(deploymentInfo.uri)}`, () => { console.info('xxx'); });
+        }
       } catch (e) {
         console.log(e); // eslint-disable-line no-console
       }