3.6.5 tinker-base

versionName:3.6.5 versionCode:91
该版本为过度版本(修复3.6.4的bug)
2019-06-04 09:35:25 +08:00 · 2019-06-03 17:48:46 +08:00 · 2019-06-03 17:46:12 +08:00 · 2019-06-03 16:18:31 +08:00 · 2019-06-03 14:31:54 +08:00 · 2019-06-03 14:30:23 +08:00
8 changed files with 13 additions and 13 deletions
--- a/app/src/main/java/com/gh/common/view/ExpendTextView.java
+++ b/app/src/main/java/com/gh/common/view/ExpendTextView.java
@ -90,7 +90,8 @@ public class ExpendTextView extends android.support.v7.widget.AppCompatTextView
        SpannableStringBuilder msp = new SpannableStringBuilder(content);
        int length = msp.length();
        int startPosition = length - mExpendText.length();
-        msp.replace(startPosition < 0 ? 0 : startPosition, length, mExpendText);
+        startPosition = startPosition < 0 ? 0 : startPosition;
+        msp.replace(startPosition, length, mExpendText);
        msp.setSpan(new ClickableSpan() {
            @Override
            public void updateDrawState(TextPaint ds) {
@ -109,7 +110,7 @@ public class ExpendTextView extends android.support.v7.widget.AppCompatTextView
                    mExpandCallback.onExpand();
                }
            }
-        }, length - mExpendText.length(), length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }, startPosition, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

        setText(msp);
        setMovementMethod(CustomLinkMovementMethod.getInstance());
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@ -306,7 +306,7 @@ public class MainActivity extends BaseActivity {
                            "玩家操作", "点击关闭"));
        }

-        checkTinkerPath();
+//        checkTinkerPath(); // todo　看情况是否需要显示弹窗

        checkRetryDownload();

--- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt
@ -1,7 +1,6 @@
 package com.gh.gamecenter.collection

 import android.app.Application
-import anet.channel.util.Utils.context
 import com.gh.common.history.HistoryDatabase
 import com.gh.gamecenter.R
 import com.gh.gamecenter.baselist.ListViewModel
@ -28,7 +27,7 @@ class CommunityArticleViewModel(application: Application) : ListViewModel<Articl

    override fun provideDataSingle(page: Int): Single<List<ArticleEntity>> {
        return if (type == CommunityArticleFragment.Type.COLLECTION) {
-            Single.fromObservable(RetrofitManager.getInstance(context).api.getCollectionCommunityArticle(UserManager.getInstance().userId, page))
+            Single.fromObservable(RetrofitManager.getInstance(getApplication()).api.getCollectionCommunityArticle(UserManager.getInstance().userId, page))
        } else {
            HistoryDatabase.instance.articleDao().getArticleWithOffset(20, (page - 1) * 20)
        }
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
@ -134,7 +134,7 @@ class RatingReplyAdapter(context: Context,
                    if (game.getApk().size == 0) {
                        setBackgroundResource(R.drawable.news_detail_comment)
                        text = "暂无"
-                        setTextColor(ContextCompat.getColor(anet.channel.util.Utils.context, R.color.button_gray))
+                        setTextColor(ContextCompat.getColor(mContext, R.color.button_gray))
                        isClickable = false
                    } else if (game.getApk().size == 1) {
                        GameUtils.setDownloadBtnStatus(mContext, game, this, PluginLocation.only_game)
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@ -1560,7 +1560,7 @@ public interface ApiService {
    /**
     * 百度ocpc激活
     */
-    @POST("app:activate")
+    @POST("./app:activate")
    Observable<ResponseBody> postActivationInfo();

    @GET("users/{user_id}/messages/{resource_id}/fold-list")
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -7,8 +7,8 @@ ext {
    targetSdkVersion = 26

    // application info
-    versionCode = 90
-    versionName = "3.6.4"
+    versionCode = 91
+    versionName = "3.6.5"
    applicationId = "com.gh.gamecenter"

    //Libraries
--- a/gradle.properties
+++ b/gradle.properties
@ -60,5 +60,5 @@ DATA_HOST=http\://data.ghzs666.com/

 # 请不要手动改动下面的值，除非你明确需要以某个apk作为基准包，需要打包请以scripts/tinker*.sh为准
 TINKER_ENABLE=
-TINKER_ID=de1b5ba2
-TINKER_BASE_APK_DIR=app-0530-16-04-38_de1b5ba2
+TINKER_ID=386c7b19
+TINKER_BASE_APK_DIR=app-0603-17-52-20_386c7b19
--- a/scripts/jenkins_build.sh
+++ b/scripts/jenkins_build.sh
@ -3,8 +3,8 @@
 # @2019.05.30

 version=$(awk -v FS="versionName = " 'NF>1{print $2}' dependencies.gradle | sed "s/\"//g")
-build_time=$(date +'%Y-%m%d-%H%M')
-build_time_without_divider=$(date +'%Y%m%d%H%M')L
+build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M')
+build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L

 git checkout app/build.gradle
 git checkout gradle.properties
Author	SHA1	Message	Date
kehaoyuan	8d55b251c3	3.6.5 tinker-base	2019-06-04 09:35:25 +08:00
kehaoyuan	386c7b19c1	versionName:3.6.5 versionCode:91 该版本为过度版本(修复3.6.4的bug)	2019-06-03 17:48:46 +08:00
kehaoyuan	eaaa168ee1	Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev	2019-06-03 17:46:12 +08:00
kehaoyuan	d9f5811d86	默认关闭tinker更新弹窗	2019-06-03 16:18:31 +08:00
chenjuntao	27d3470abc	修复使用错误上下文的问题	2019-06-03 14:31:54 +08:00
juntao	36f7427613	Merge branch '3.6.5' into 'dev' 修复 3.6.4 遗留问题 See merge request !6	2019-06-03 14:30:23 +08:00
chenjuntao	929c117ddb	修复使用错误上下文的问题	2019-06-03 10:26:48 +08:00
chenjuntao	7d6d77fae5	修复激活数据链接出错的问题	2019-06-03 10:22:20 +08:00
chenjuntao	2297461d91	修复数组越界问题	2019-06-03 10:22:12 +08:00
chenjuntao	a26a3bebad	修复 jenkins 打包时间时区不对的问题	2019-06-03 10:22:04 +08:00
chenjuntao	4a673de424	修复激活数据链接出错的问题	2019-06-03 10:11:29 +08:00
chenjuntao	a837c2ccd4	修复数组越界问题	2019-05-31 18:30:11 +08:00
chenjuntao	10ee3132fd	修复 jenkins 打包时间时区不对的问题	2019-05-31 09:57:17 +08:00