修复 TabLayout 标题字异常问题

coderpage · Apr 23, 2019 · 51ccf39 · 51ccf39
1 parent f56338e
commit 51ccf39
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/app/src/main/java/com/coderpage/mine/app/tally/update/LatestVersionFetcher.java b/app/src/main/java/com/coderpage/mine/app/tally/update/LatestVersionFetcher.java
@@ -34,8 +34,8 @@
 class LatestVersionFetcher implements SourceFetcher {
     private static final String TAG = makeLogTag(LatestVersionFetcher.class);
 
-    private static final String VERSION_BASE_URL = "http://192.168.1.31:8001";
-    // private static final String VERSION_BASE_URL = "http://app.coderpage.com";
+    // private static final String VERSION_BASE_URL = "http://192.168.1.31:8001";
+    private static final String VERSION_BASE_URL = "http://app.coderpage.com";
 
     @Override
     public Result<ApkModel, Error> fetchApkModel() {

diff --git a/app/src/main/res/layout/tally_module_edit_activity_record_edit.xml b/app/src/main/res/layout/tally_module_edit_activity_record_edit.xml
@@ -34,7 +34,6 @@
                 app:mTabMode="fixed"
                 app:mTabPadding="@dimen/spacing_micro"
                 app:mTabSelectedTextColor="@color/black"
-                app:mTabSelectedTextSize="@dimen/app_text_size_large"
                 app:mTabTextBoldOnSelect="true"
                 app:mTabTextColor="@color/appTextColorSecondary"
                 app:mTabTextSize="@dimen/app_text_size_normal" />

diff --git a/app/src/main/res/layout/tally_module_edit_category_activity_manager.xml b/app/src/main/res/layout/tally_module_edit_category_activity_manager.xml
@@ -40,7 +40,6 @@
                 app:mTabMode="fixed"
                 app:mTabPadding="@dimen/spacing_micro"
                 app:mTabSelectedTextColor="@color/black"
-                app:mTabSelectedTextSize="24sp"
                 app:mTabTextBoldOnSelect="true"
                 app:mTabTextColor="@color/appTextColorSecondary"
                 app:mTabTextSize="@dimen/app_text_size_normal" />

diff --git a/build.gradle b/build.gradle
@@ -15,9 +15,9 @@ props.each { key, val ->
 }
 
 ext {
-    appVersionName = '0.5.0'
-    appVersionCode = 50
-    applicationId = 'com.coderpage.mine.dev'
+    appVersionName = '0.6.0'
+    appVersionCode = 60
+    applicationId = 'com.coderpage.mine'
 
     minSdkVersion = 18
     targetSdkVersion = 25

diff --git a/libbase/src/main/java/com/coderpage/base/widget/MTabLayout.java b/libbase/src/main/java/com/coderpage/base/widget/MTabLayout.java
@@ -67,8 +67,8 @@
 
 /**
  * @author : liuchao
- *         created on 2018/8/7 上午10:05
- *         description : TAB LAYOUT
+ * created on 2018/8/7 上午10:05
+ * description : TAB LAYOUT
  */
 public class MTabLayout extends HorizontalScrollView {
 
@@ -1476,7 +1476,7 @@ public void setSelected(final boolean selected) {
                 }
                 // 选中状态，字体大小设置
                 if (mTabTextSize != mTabTextSelectSize && mTabTextSelectSize > 0) {
-                    mTextView.setTextSize(selected ? mTabTextSelectSize : mTabTextSize);
+                    mTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, selected ? mTabTextSelectSize : mTabTextSize);
                 }
             }
             if (mIconView != null) {

diff --git a/libupdate/src/main/java/com/coderpage/lib/update/DownloadService.java b/libupdate/src/main/java/com/coderpage/lib/update/DownloadService.java
@@ -100,8 +100,7 @@ private void startDownload() {
                 install.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                 Uri contentUri = FileProvider.getUriForFile(
                         getApplicationContext(),
-                        // TODO 自定义 authority
-                        "com.coderpage.mine.dev.fileProvider",
+                        getApplication().getApplicationInfo().packageName + ".fileProvider",
                         result.data());
                 install.setDataAndType(contentUri, "application/vnd.android.package-archive");
             } else {