Merge pull request #14 from TRPGEngine/master

v0.1.5

Author: moonrailgun

.gitignore

@@ -6,7 +6,8 @@ config/local.js
 .sentryclirc
 .buildcache/
 build/metro/conf.json
-
+build/emoji/emoji/
+android/gradle.properties
 
 # Logs
 logs

android/app/build.gradle

@@ -123,21 +123,27 @@ android {
         }
     }
 
-    // // 签名相关
-    // signingConfigs {
-    //     release {
-    //         storeFile file(MYAPP_RELEASE_STORE_FILE)
-    //         storePassword MYAPP_RELEASE_STORE_PASSWORD
-    //         keyAlias MYAPP_RELEASE_KEY_ALIAS
-    //         keyPassword MYAPP_RELEASE_KEY_PASSWORD
-    //     }
-    // }
+    // 签名相关
+    signingConfigs {
+        release {
+            if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
+                storeFile file(MYAPP_RELEASE_STORE_FILE)
+                storePassword MYAPP_RELEASE_STORE_PASSWORD
+                keyAlias MYAPP_RELEASE_KEY_ALIAS
+                keyPassword MYAPP_RELEASE_KEY_PASSWORD
+            }
+        }
+    }
 
     buildTypes {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            // signingConfig signingConfigs.release // 使用签名
+            signingConfig signingConfigs.release // 使用签名
+        }
+
+        debug {
+            applicationIdSuffix ".test"
         }
     }
     // applicationVariants are e.g. debug, release
@@ -151,11 +157,24 @@ android {
                 output.versionCodeOverride =
                         versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
+
+            // 定义输出文件命名
+            def outputFile = output.outputFile
+            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                def fileName
+                if (variant.buildType.name.equals('release')) {
+                    fileName = "TRPGEngine-v${defaultConfig.versionName}_${defaultConfig.versionCode}.apk"
+                } else {
+                    fileName = "TRPGEngine-v${defaultConfig.versionName}-beta.apk"
+                }
+                output.apkData.outputFileName = fileName
+            }
         }
     }
 }
 
 dependencies {
+    implementation project(':react-native-fast-image')
     implementation project(':react-native-webview')
     implementation project(':react-native-sentry')
     implementation project(':react-native-code-push')

android/app/src/main/java/com/moonrailgun/trpg/MainApplication.java

@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.dylanvann.fastimage.FastImageViewPackage;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
 import io.sentry.RNSentryPackage;
 import com.microsoft.codepush.react.CodePush;
@@ -39,6 +40,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new FastImageViewPackage(),
             new RNCWebViewPackage(),
             new RNSentryPackage(),
             new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG),

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'trpg'
+include ':react-native-fast-image'
+project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-sentry'

build/emoji/fetch-github-emoji.js

@@ -0,0 +1,50 @@
+const path = require('path');
+const axios = require('axios');
+const fs = require('fs-extra');
+
+fs.ensureDir(path.resolve(__dirname, './emoji'));
+
+function fetchEmojiAndSave(name, url) {
+  return axios
+    .get(url, {
+      responseType: 'arraybuffer',
+    })
+    .then((res) => {
+      const data = res.data;
+      console.log('保存表情:', name);
+      return fs.outputFile(
+        path.resolve(__dirname, `./emoji/${name}.png`),
+        data
+      );
+    })
+    .catch((err) => {
+      const item = { name, url };
+      console.error('保存失败:', item);
+
+      errorList.push(item);
+    });
+}
+
+const errorList = [];
+
+axios
+  .get('https://api.github.com/emojis')
+  .then((res) => {
+    const data = res.data;
+
+    const list = [];
+    for (const name in data) {
+      if (data.hasOwnProperty(name)) {
+        const url = data[name];
+
+        list.push(fetchEmojiAndSave(name, url));
+      }
+    }
+
+    return Promise.all(list);
+  })
+  .then((list) => {
+    console.log(`保存完毕, 共${list.length}个文件, 失败${errorList.length}个`);
+
+    fs.outputJson(path.resolve(__dirname, 'errorList.json'), errorList);
+  });

build/husky/commit-msg.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const _ = require('lodash');
+const commitFile = process.env['HUSKY_GIT_PARAMS'];
+const allowScope = require('./lib/allow-scope');
+const allowTag = require('./lib/allow-tag');
+const re = new RegExp(
+  `:(${allowTag.join('|')}): \\[(${allowScope.join('|')})\\] .*?`
+);
+
+const msg = fs.readFileSync(commitFile, {
+  encoding: 'utf-8',
+});
+const firstLine = _.trim(_.head(msg.split('\n')));
+const tipCommitFormat = `
+${firstLine}
+
+————————————————————
+
+你的提交不合法, 推荐的提交格式:
+    :tag: [scope] any string
+
+允许的tag:
+  ${allowTag.join(', ')}
+允许的scope:
+  ${allowScope.join(', ')}
+`;
+
+if (!re.test(firstLine)) {
+  console.log(tipCommitFormat);
+  process.exit(1);
+}

build/husky/lib/allow-scope.js

@@ -0,0 +1 @@
+module.exports = ['app', 'web', 'all', 'layout', 'redux'];

build/husky/lib/allow-tag.js

@@ -0,0 +1 @@
+module.exports = ['star', 'hammer', 'bug', 'fire'];

build/metro/babel-transformer.js

@@ -44,6 +44,9 @@ const getBabelRC = (function() {
 
     // specify babel rc path
     let projectBabelRCPath = path.resolve(__dirname, 'babel.config.js');
+    if (NODE_ENV === 'production') {
+      projectBabelRCPath = path.resolve(__dirname, 'babel.config.prod.js');
+    }
     console.log('loading babel config:', projectBabelRCPath);
     if (fs.existsSync(projectBabelRCPath)) {
       babelRC.extends = projectBabelRCPath;

build/metro/babel.config.js

@@ -1,5 +1,8 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: [
+    'module:metro-react-native-babel-preset',
+    '@babel/preset-typescript',
+  ],
   plugins: [
     [
       'transform-inline-environment-variables',