Browse Source

仓库通用版2修改对应的打包配置

Owen 3 years ago
parent
commit
59ef95330e

+ 5 - 5
app/build.gradle

@@ -4,16 +4,16 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         udapda {
-            keyAlias 'pda_smart_com_key'
+            keyAlias 'pdakeystone'
             keyPassword 'pdakeystone'
-            storeFile file('C:\\sigin\\pda_smart_com_keystone.jks')
+            storeFile file('C:\\sigin\\pda_smart_com_two_keystone.jks')
             storePassword 'pdakeystone'
         }
     }
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {
-        applicationId "com.uas.pda_smart_com"
+        applicationId "com.uas.pda_smart_com_two"
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.versionCode
@@ -41,11 +41,11 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_PDA_SMART_COM_RELEASE_${releaseInfo}.apk"
+                    fileName = "UAS_PDA_SMART_COM_TWO_RELEASE_${releaseInfo}.apk"
 
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_PDA_SMART_COM_DEBUG_${debugInfo}.apk"
+                    fileName = "UAS_PDA_SMART_COM_TWO_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -62,7 +62,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.uas.pda_smart_com"
+            android:authorities="com.uas.pda_smart_com_two"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

+ 0 - 2
app/src/main/java/com/uas/pda_smart_com/activity/FunctionActivity.java

@@ -56,10 +56,8 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
         actionBarTextView = (TextView) findViewById(R.id.tv_actionbar_withback);
         mActionBarLayout = (RelativeLayout) findViewById(R.id.include_menuactionbar);
         mListImageView = (ImageView) findViewById(R.id.btn_actionbar_list_icon_iv);
-
         //添加监听事件
         btnBack.setOnClickListener(this);
-
         //获取用户选择的功能名称
         Intent intent = getIntent();
         String funName = intent.getStringExtra(DataSourceManager.KEY_GRID_ITEMNAME);

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="my_app_name">UAS智能终端系统</string>
-    <string name="my_app_name_test">PDA-仓库通用</string>
+    <string name="my_app_name_test">PDA-仓库通用2</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_connect_server_fragment">ConnectServerFragment</string>

+ 2 - 2
build.gradle

@@ -43,8 +43,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 21,
-            versionName      : "v2.1"
+            versionCode      : 1,
+            versionName      : "v1.0"
     ]
 
     depsVersion = [