Skip to content

Commit a02fa7c

Browse files
author
aaron
committed
Coding 个人版最后一个版本
1 parent 42ceb5c commit a02fa7c

File tree

7 files changed

+25
-6
lines changed

7 files changed

+25
-6
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ android {
5757
person {
5858
dimension "mode"
5959
applicationId "net.coding.program"
60-
versionCode 543
61-
versionName "5.4.3.20181018.1"
60+
versionCode 545
61+
versionName "5.4.5.20190219.1"
6262
targetSdkVersion 23
6363

6464
manifestPlaceholders = [
@@ -70,8 +70,8 @@ android {
7070
enterprise {
7171
dimension "mode"
7272
applicationId "net.coding.program.enterprise"
73-
versionCode 297
74-
versionName "2.9.7.20180724.1"
73+
versionCode 298
74+
versionName "2.9.8.20190219.1"
7575
targetSdkVersion 21
7676

7777
// 信鸽依赖

app/src/main/java/net/coding/program/MyApp.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,9 @@ public boolean openActivityByUri(Context context, String uri, boolean newTask, b
695695
String projectString = matcher.group(2);
696696
String version = matcher.group(3);
697697
String projectPath = String.format("/user/%s/project/%s", userString, projectString);
698+
if (!TextUtils.isEmpty(version)) {
699+
version = Global.decodeUtf8(version);
700+
}
698701

699702
intent.putExtra("mProjectPath", projectPath);
700703
intent.putExtra("mVersion", version);

app/src/main/java/net/coding/program/project/MainProjectFragment.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,21 @@ class MainProjectFragment : BaseFragment() {
113113
}
114114
}
115115

116+
private fun soldOutTip() {
117+
topTip.visibility = View.VISIBLE
118+
closeTipButton.setOnClickListener { topTip.visibility = View.GONE }
119+
topTipText.setText(R.string.sold_out_app)
120+
topTip.setOnClickListener { Global.updateByMarket(activity) }
121+
}
122+
116123
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
117124
super.onViewCreated(view, savedInstanceState)
118125

119126
terminalClick.setOnClickListener { terminalClick() }
120127
toolbarTitle.setOnClickListener { toolbarTitle() }
121128
initMainProjectFragment()
122129

123-
checkNeedUpdate()
130+
soldOutTip()
124131
}
125132

126133
internal fun toolbarTitle() {

app/src/main/java/net/coding/program/project/detail/GitViewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected final void initGitViewActivity() {
8282

8383
client = MyAsyncHttpClient.createClient(GitViewActivity.this);
8484

85-
urlBlob = String.format(urlBlob, mProjectPath, mVersion, Global.encodeUtf8(Global.encodeUtf8(mGitFileInfoObject.path)));
85+
urlBlob = String.format(urlBlob, mProjectPath, mVersion, Global.encodeUtf8(mGitFileInfoObject.path));
8686
webview.getSettings().setBuiltInZoomControls(true);
8787
Global.initWebView(webview);
8888

app/src/main/res/layout/top_tip.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,21 @@
1616
android:layout_marginLeft="15dp"
1717
android:layout_marginRight="10dp"
1818
android:scaleType="center"
19+
android:visibility="gone"
1920
android:src="@drawable/top_tip_icon" />
2021

2122
<TextView
2223
android:id="@+id/topTipText"
2324
android:layout_width="0dp"
25+
android:layout_marginLeft="@dimen/padding_15"
2426
android:layout_height="wrap_content"
2527
android:layout_weight="1"
2628
android:paddingBottom="@dimen/padding_10"
2729
android:paddingRight="@dimen/padding_15"
2830
android:paddingTop="@dimen/padding_10"
2931
android:text="@string/tip_need_userinfo"
32+
tools:text="@string/sold_out_app"
33+
android:lineSpacingExtra="5dp"
3034
android:textColor="@color/layout_yellow_font"
3135
android:textSize="14sp" />
3236

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<string name="title_activity_friend">选择好友</string>
5050
<string name="tip_vip_expired">请到网站续费</string>
5151
<string name="tip_update_app">立即升级最新 Coding 客户端</string>
52+
<string name="sold_out_app">温馨提示:出于实际使用场景限制的考虑,该 App 不再进行更多新功能开发,建议您前往 PC 端网页版体验更完整的产品功能。</string>
5253
<string name="empty" />
5354
<string name="title_activity_manually_qcode">手动添加账号</string>
5455
<string name="title_activity_like_users_list">打赏和点赞的用户</string>

common-coding/src/main/java/net/coding/program/common/Global.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,10 @@ public static String decodeUtf8(String s) {
264264
}
265265
}
266266

267+
public static String decodeUtf8Double(String s) {
268+
return decodeUtf8(decodeUtf8(s));
269+
}
270+
267271
public static boolean isImageUri(String s1) {
268272
s1 = s1.toLowerCase();
269273
return s1.endsWith(".png")

0 commit comments

Comments
 (0)