Skip to content

Commit 75784b9

Browse files
wintercoderwintercoder
committed
请求增加版本号字段，修复挂科颜色Bug
1 parent a79b85d commit 75784b9

File tree

6 files changed

+28
-23
lines changed

6 files changed

+28
-23
lines changed

‎app/src/main/java/com/guang/app/AppConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class AppConfig {
1010
public static int defaultPage = 0; //app启动后的默认页面
1111
public static String localAesSeed = "local"; //本地存密码的加密key
1212
public static String netAesSeed = "netdsad238139dsad"; //网络密约，未用到
13+
public static String appVer = ""; //ApiUtils.java没有Context，故全局变量实现
1314

1415
//千万记得这个URL要/结尾！！！
1516
public static final String BASE_URL = "http://app.wegdufe.com:82/";

‎app/src/main/java/com/guang/app/activity/MainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.guang.app.fragment.HomeFragment;
1818
import com.guang.app.fragment.MeFragment;
1919
import com.guang.app.model.AppTips;
20+
import com.guang.app.util.CalcUtils;
2021
import com.guang.app.util.FileUtils;
2122
import com.guang.app.util.FragmentUtil;
2223
import com.guang.app.util.TimeUtils;
@@ -46,6 +47,7 @@ public class MainActivity extends BaseActivity {
4647
protected void onCreate(Bundle savedInstanceState) {
4748
super.onCreate(savedInstanceState);
4849
setContentView(R.layout.main);
50+
AppConfig.appVer = CalcUtils.getVersionName(this);
4951

5052
//未登录跳转登陆页
5153
if(!FileUtils.getStoredAccountAndSetApp(this) || TextUtils.isEmpty(AppConfig.sno) || TextUtils.isEmpty(AppConfig.idsPwd)){

‎app/src/main/java/com/guang/app/adapter/ScoreAdapter.java

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ public ScoreAdapter(Context context,int layoutResId) {
2323

2424
@Override
2525
protected void convert(final BaseViewHolder viewHolder, Score item) {
26-
viewHolder.setText(R.id.tv_course_name,item.getName())
27-
.setText(R.id.tv_time,item.getTime())
28-
.setText(R.id.tv_score,""+item.getScore())
29-
.setText(R.id.tv_credit,""+item.getCredit())
30-
.setText(R.id.tv_grade_point, CalcUtils.calcScore2Gpa(item.getScore()))
31-
.setVisible(R.id.score_expandable, false)
32-
.setVisible(R.id.score_item_separator, false);
26+
viewHolder.setText(R.id.tv_course_name, item.getName())
27+
.setText(R.id.tv_time, item.getTime())
28+
.setText(R.id.tv_score, "" + item.getScore())
29+
.setText(R.id.tv_credit, "" + item.getCredit())
30+
.setText(R.id.tv_grade_point, CalcUtils.calcScore2Gpa(item.getScore()))
31+
.setVisible(R.id.score_expandable, false)
32+
.setVisible(R.id.score_item_separator, false);
3333

3434
//下拉后的内容
35-
viewHolder.setText(R.id.tv_classcode,""+item.getClassCode())
36-
.setText(R.id.tv_score_exp,""+item.getExpScore())
37-
.setText(R.id.tv_score_daily,""+item.getDailyScore())
38-
.setText(R.id.tv_score_paper,""+item.getPaperScore());
35+
viewHolder.setText(R.id.tv_classcode, "" + item.getClassCode())
36+
.setText(R.id.tv_score_exp, "" + item.getExpScore())
37+
.setText(R.id.tv_score_daily, "" + item.getDailyScore())
38+
.setText(R.id.tv_score_paper, "" + item.getPaperScore());
3939

4040
//点击下拉按钮显示/隐藏额外信息，BaseRecyclerViewAdapterHelper框架也能实现，这里手动实现 https://github.com/CymChad/BaseRecyclerViewAdapterHelper/wiki/%E5%88%86%E7%BB%84%E7%9A%84%E4%BC%B8%E7%BC%A9%E6%A0%8F
4141
viewHolder.setOnCheckedChangeListener(R.id.score_btn_expandable_toggle, new CompoundButton.OnCheckedChangeListener() {
@@ -46,27 +46,28 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
4646
}
4747
});
4848
//让整个内容条的点击都生效 显示/隐藏信息 ，提高体验
49-
viewHolder.getView(R.id.layout_score_item_content).setOnClickListener( new View.OnClickListener() {
49+
viewHolder.getView(R.id.layout_score_item_content).setOnClickListener(new View.OnClickListener() {
5050
@Override
5151
public void onClick(View view) {
52-
if(view.getId() != R.id.score_btn_expandable_toggle) { //虽然想防止多次点击（听声音） 但好像没什么效果，该条件要不要都行
52+
if (view.getId() != R.id.score_btn_expandable_toggle) { //虽然想防止多次点击（听声音） 但好像没什么效果，该条件要不要都行
5353
viewHolder.getView(R.id.score_btn_expandable_toggle).performClick();
5454
}
5555
}
5656
});
5757

58-
colorTextViewByScore(viewHolder,R.id.tv_score,item.getScore());
59-
colorTextViewByScore(viewHolder,R.id.tv_score_daily,item.getDailyScore());
60-
colorTextViewByScore(viewHolder,R.id.tv_score_paper,item.getPaperScore());
58+
colorTextViewByScore(viewHolder, R.id.tv_score, item.getScore());
59+
colorTextViewByScore(viewHolder, R.id.tv_score_daily, item.getDailyScore());
60+
colorTextViewByScore(viewHolder, R.id.tv_score_paper, item.getPaperScore());
6161
}
62-
6362
//根据分数填充颜色，实验成绩不需要填充，暂没做 重修判断
6463
private void colorTextViewByScore(BaseViewHolder viewHolder,int textViewId, int score) {
6564
if( score < 60) {
6665
viewHolder.setTextColor(textViewId, mContext.getResources().getColor(R.color.goal_item_failed_color));
67-
if(textViewId == R.id.tv_score){
68-
viewHolder.setTextColor(R.id.tv_course_name, mContext.getResources().getColor(R.color.goal_item_failed_color));
69-
}
66+
// if(textViewId == R.id.tv_score){ //给标题加红的话，下拉上滑后就乱标红色了，框架的复用item有问题
67+
// viewHolder.setTextColor(R.id.tv_course_name, mContext.getResources().getColor(R.color.goal_item_failed_color));
68+
// }else{
69+
// viewHolder.setTextColor(R.id.tv_course_name, mContext.getResources().getColor(R.color.normal_item_passed_text_color));
70+
// }
7071
}else{
7172
viewHolder.setTextColor(textViewId, mContext.getResources().getColor(R.color.goal_item_passed_color));
7273
}

‎app/src/main/java/com/guang/app/api/ApiUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ public static Retrofit getApi(String password){
4949
new BasicParamsInterceptor.Builder()
5050
.addParam("sno", AppConfig.sno)
5151
.addParam("pwd",password)
52+
.addParam("from","android")
53+
.addParam("app_ver",AppConfig.appVer)
5254
.build();
5355
OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder()
5456
.addInterceptor(basicParamsInterceptor)

‎app/src/main/java/com/guang/app/util/CalcUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ public static String getVersionName(Context context) {
7676
try {
7777
PackageManager manager = context.getPackageManager();
7878
PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
79-
String version = info.versionName;
80-
return version;
79+
return info.versionName;
8180
} catch (Exception e) {
8281
e.printStackTrace();
8382
return "0.0.1";

‎app/src/main/res/layout/score_listitem.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
android:background="@color/socre_item_name_default_color"
1616
android:textColor="@color/normal_item_passed_text_color"
1717
android:paddingLeft="@dimen/listitem_title_padding_left"/>
18-
<!---->
18+
1919

2020
<TableLayout
2121
android:id="@+id/layout_score_item_content"

0 commit comments

Comments
 (0)