Skip to content

Commit 980f112

Browse files
committed
3.1.6 正式版
1 parent 4e502d2 commit 980f112

4 files changed

Lines changed: 13 additions & 6 deletions

File tree

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="net.coding.program"
4-
android:versionCode="80"
5-
android:versionName="3.1.5">
4+
android:versionCode="84"
5+
android:versionName="3.1.6">
66

77
<uses-sdk
88
android:minSdkVersion="15"

app/src/main/java/net/coding/program/model/PointObject.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ public String getUsage() {
7272
return usage;
7373
}
7474

75+
public boolean isIncome() {
76+
return action == 1;
77+
}
78+
7579
public void setUsage(String usage) {
7680
this.usage = usage;
7781
}

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
@@ -76,7 +76,7 @@ protected final void initGitViewActivity() {
7676

7777
client = MyAsyncHttpClient.createClient(GitViewActivity.this);
7878

79-
urlBlob = String.format(urlBlob, mProjectPath, mVersion, Global.encodeUtf8(mGitFileInfoObject.path));
79+
urlBlob = String.format(urlBlob, mProjectPath, mVersion, Global.encodeUtf8(Global.encodeUtf8(mGitFileInfoObject.path)));
8080
webview.getSettings().setBuiltInZoomControls(true);
8181
Global.initWebView(webview);
8282

app/src/main/java/net/coding/program/user/UserPointActivity.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
7676
}
7777
} else if (tag.equals(TAG_HTTP_ALL_POINTS)) {
7878
if (code == 0) {
79-
double points = respanse.optJSONObject("data").optDouble("points_total");
79+
double points = respanse.optJSONObject("data").optDouble("points_left");
8080
pointsAll.setText(String.format("%.2f", points));
8181
} else {
8282
showErrorMsg(code, respanse);
@@ -101,13 +101,16 @@ public void bind(PointObject data) {
101101
usage.setText(data.getUsage());
102102
double points_change = data.getPoints_change();
103103
String changeForamt;
104-
if (points_change >= 0) {
104+
int textColor;
105+
if (data.isIncome()) {
105106
changeForamt = String.format("+%.2f", points_change);
107+
textColor = 0xff3bbd79;
106108
} else {
107109
changeForamt = String.format("-%.2f", points_change);
110+
textColor = 0xfffb8638;
108111
}
109112
pointsChange.setText(changeForamt);
110-
pointsChange.setTextColor(points_change >= 0 ? 0xff3bbd79 : 0xfffb8638);
113+
pointsChange.setTextColor(textColor);
111114
create.setText(Global.mDateYMDHH.format(data.getCreated_at()));
112115
pointsLeft.setText(String.format("余额: %.2f", data.getPoints_left()));
113116
}

0 commit comments

Comments
 (0)