10-27 pre

KiWiLss · Oct 28, 2020 · 55546c2 · 55546c2
1 parent 23893d6
commit 55546c2
Show file tree

Hide file tree

Showing 10 changed files with 624 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,12 +23,22 @@ loadProperties()//调用方法
 android {
     signingConfigs {
         release {
-            storeFile file(buildProperty.storeFile)
-            storePassword buildProperty.storePassword
-            keyAlias buildProperty.keyAlias
-            keyPassword buildProperty.keyPassword
+            storeFile file('C:\\Users\\Administrator\\Desktop\\apktool\\kiwi.jks')
+            storePassword '123456'
+            keyAlias 'kiwi'
+            keyPassword '123456'
         }
     }
+
+
+//    signingConfigs {
+//        release {
+//            storeFile file(buildProperty.storeFile)
+//            storePassword buildProperty.storePassword
+//            keyAlias buildProperty.keyAlias
+//            keyPassword buildProperty.keyPassword
+//        }
+//    }
     compileSdkVersion app.compileSdkVersion
     buildToolsVersion app.buildToolsVersion
 
@@ -43,11 +53,25 @@ android {
     }
 
     buildTypes {
+        debug{
+            signingConfig signingConfigs.release
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            manifestPlaceholders.put("appName","XView测试版")
+        }
+        pre{
+            signingConfig signingConfigs.release
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            manifestPlaceholders.put("appName","XView预览版")
+        }
         release {
             signingConfig signingConfigs.release
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            manifestPlaceholders.put("appName","XView正式版")
         }
+
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.kiwilss.xview",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,10 +11,11 @@
         android:name="com.kiwilss.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="${appName}"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="label">
         <activity
             android:name=".design.drawer.NormalDrawerActivity"
             android:label="@string/title_activity_main"

diff --git a/app/src/main/java/com/kiwilss/App.kt b/app/src/main/java/com/kiwilss/App.kt
@@ -17,6 +17,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
+import com.dylanc.loadinghelper.BuildConfig
 import com.dylanc.loadinghelper.LoadingHelper
 import com.dylanc.loadinghelper.ViewType
 import com.kiwilss.xview.R
@@ -72,6 +73,7 @@ class App : Application(){
             register(ViewType.EMPTY, EmptyAdapter())
         }
         LoadingHelper.setDefaultAdapterPool(adapterPool)
+
     }
 
 

diff --git a/app/src/main/java/com/kiwilss/xview/ui/copy/MTActivity.java b/app/src/main/java/com/kiwilss/xview/ui/copy/MTActivity.java
@@ -4,15 +4,13 @@
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.view.View;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.kiwilss.xview.R;
 import com.kiwilss.xview.nulltest.enumtest.Coupon;
 import com.kiwilss.xview.utils.LogUtils;
-import com.kiwilss.xview.utils.StringLengthsUtil;
 
 /**
  * @author : Lss Administrator
@@ -57,15 +55,15 @@ public void run() {
 
 
         String name = "不确定宽度,,度,不确定字数--不确定宽度,,度,不确定字数--不确定宽度,,度,不确定不确定宽度,,度,不确定字数--不确定宽度,,度,不确定字数--不确定宽度,,度,不确定字数哈哈哈";
-        TextView tvIcon = (TextView) findViewById(R.id.tv_rl_test_icon);
-        tvIcon.setText(name);
-
-        tvIcon.setOnClickListener(view -> {
-            String newName = tvIcon.getText().toString();
-            int lineCount = tvIcon.getLineCount();
-            String singleLines = StringLengthsUtil.getSingleLines(tvIcon, 1);
-            LogUtils.e(singleLines);
-        });
+//        TextView tvIcon = (TextView) findViewById(R.id.tv_rl_test_icon);
+//        tvIcon.setText(name);
+//
+//        tvIcon.setOnClickListener(view -> {
+//            String newName = tvIcon.getText().toString();
+//            int lineCount = tvIcon.getLineCount();
+//            String singleLines = StringLengthsUtil.getSingleLines(tvIcon, 1);
+//            LogUtils.e(singleLines);
+//        });
 
 
 //        Drawable drawable = ContextCompat.getDrawable(this,R.mipmap.female_icon);

diff --git a/app/src/main/res/layout/activity_header_zoom.xml b/app/src/main/res/layout/activity_header_zoom.xml
@@ -176,7 +176,7 @@
         android:layout_width="70dp"
         android:layout_height="70dp"
         android:layout_marginLeft="15dp"
-        android:src="@mipmap/leak_canary_icon"
+        android:src="@mipmap/wuhuang"
         app:civ_border_color="@color/yellow_FF9B52"
         app:civ_border_width="2dp"
         app:layout_anchor="@+id/sv_header_zoom_middle"

diff --git a/app/src/main/res/layout/item_sticky_custom_top.xml b/app/src/main/res/layout/item_sticky_custom_top.xml
@@ -16,6 +16,6 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/leak_canary_icon"/>
+        android:src="@mipmap/ic_launcher"/>
 
 </RelativeLayout>