李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 e631e4b1655f6a38acb6d4d17ece51652a375c7c 1 个父辈 71803893

add

内嵌 并排对比
正在显示 20 个修改的文件 包含 179 行增加 和 50 行删除
... ... @@ -169,6 +169,54 @@ public class TzlistJzEntity {
private String parent_name;
private String student_name;
public int getIs_author() {
return is_author;
}
public void setIs_author(int is_author) {
this.is_author = is_author;
}
public int getRead_time() {
return read_time;
}
public void setRead_time(int read_time) {
this.read_time = read_time;
}
public int getIs_read() {
return is_read;
}
public void setIs_read(int is_read) {
this.is_read = is_read;
}
public int getItemType() {
return itemType;
}
public void setItemType(int itemType) {
this.itemType = itemType;
}
public String getParent_name() {
return parent_name;
}
public void setParent_name(String parent_name) {
this.parent_name = parent_name;
}
public String getStudent_name() {
return student_name;
}
public void setStudent_name(String student_name) {
this.student_name = student_name;
}
public String getLabel() {
return label;
}
... ...
... ... @@ -181,7 +181,7 @@ public class StuEvaFragment_per extends BaseFragment {
/* 项目数据实例化 */
private void init_sj() {
name.setText(Config.Student_name);
tb_a.setText(Config.Student_name + "日常表现折线图");
tb_a.setText(Config.Student_name + "日常表现对比图");
tb_b.setText(Config.Student_name + "日常表现详细得分图");
pjfx_sj_rv = getActivity().findViewById(R.id.pjfx_sj_recycler);
... ...
... ... @@ -176,7 +176,7 @@ public class StuEvaFragment_per2 extends BaseFragment {
/* 项目数据实例化 */
private void init_sj() {
name.setText(Config.Student_name);
tb_a.setText(Config.Student_name + "日常表现折线图");
tb_a.setText(Config.Student_name + "日常表现对比图");
tb_b.setText(Config.Student_name + "日常表现详细得分图");
pjfx_sj_rv = getActivity().findViewById(R.id.pjfx_sj_recycler);
... ...
... ... @@ -254,6 +254,13 @@ public class Hdxq_Activity extends BaseActivity {
fbButton.setClickable(false);
fbButton.setBackgroundResource(R.drawable.dot_gray);
}
if (info.getData().getContent().length() > 200) {
showBut.setVisibility(View.VISIBLE);
contentTv.setVisibility(View.GONE);
} else {
showBut.setVisibility(View.GONE);
contentTv.setVisibility(View.VISIBLE);
}
title.setText(info.getData().getTitle());
class_id = info.getData().getClass_id();
teacherName.setText(info.getData().getTeacher_name());
... ... @@ -282,12 +289,12 @@ public class Hdxq_Activity extends BaseActivity {
// } else {
contentTv.setText(info.getData().getContent());
// }
// RequestOptions requestOptions = RequestOptions.circleCropTransform();
// RequestOptions requestOptions = RequestOptions.circleCropTransform();
if (is_author == 1 || info.getData().getOpen_switch() == 1) {//允许看 0=否,1=是
tabNames.add("未参与" + "(" + info.getData().getUn_view_num() + ")");
tabNames.add("已参与" + "(" + info.getData().getRe_view_num() + ")");
tabNames.add("未参与" + "(" + info.getData().getUn_view_num() + ")");
ActiveSignEntity.DataBean.ListBean seelistbean = info.getData().getList();
List<StudentCkEntity> studentCkEntities = new ArrayList<>();
List<StudentCkEntity> unstudentCkEntities = new ArrayList<>();
... ... @@ -306,8 +313,8 @@ public class Hdxq_Activity extends BaseActivity {
}
}
//参与未参与列表
fragmentList.add(new Hd_Unsee_Fragment(unstudentCkEntities, viewPager));
fragmentList.add(new Hd_see_Fragment(studentCkEntities, viewPager));
fragmentList.add(new Hd_Unsee_Fragment(unstudentCkEntities, viewPager));
fragmentAdater = new MyAdapter(getSupportFragmentManager());
viewPager.setAdapter(fragmentAdater);
viewPager.resetHeight(0);
... ... @@ -518,7 +525,7 @@ public class Hdxq_Activity extends BaseActivity {
contentTv.setVisibility(View.GONE);
showText.setText("展开");
showImg.setEnabled(true);
scrollView.scrollTo(0,0);
scrollView.scrollTo(0, 0);
} else if (showText.getText().toString().equals("展开")) {
// imgRv.setVisibility(View.VISIBLE);
// voiceRv.setVisibility(View.VISIBLE);
... ... @@ -1046,6 +1053,7 @@ public class Hdxq_Activity extends BaseActivity {
}
}
}
@Override
protected void onDestroy() {
super.onDestroy();
... ...
... ... @@ -112,6 +112,7 @@ public class TzxqActivity extends BaseActivity {
RecyclerView ckRecycle;
@BindView(R.id.tv_chakan)
TextView tvChakan;
@BindView(R.id.ll_ck)
LinearLayout llCk;
@BindView(R.id.scrollView)
NestedScrollView scrollView;
... ... @@ -160,7 +161,7 @@ public class TzxqActivity extends BaseActivity {
public void onNext(TzxqEntity tzxqEntity) {
myTzxqEntity = tzxqEntity;
if (tzxqEntity.getCode() == M.success) {
if(tzTitleTv==null){
if (tzTitleTv == null) {
return;
}
tzTitleTv.setText(tzxqEntity.getData().getTitle());
... ... @@ -266,7 +267,14 @@ public class TzxqActivity extends BaseActivity {
tvChakan.setText("已查看（" + tzxqEntity.getData().getRe_view_num() + "）");
//如果列表和详情的数不等，刷新列表
if (getIntent().getIntExtra("view_num", 0) != tzxqEntity.getData().getRe_view_num()) {
Tz_Rv_Fragment.DO_REFRESH = true;
// Intent intent =new Intent();
// intent.putExtra("position",getIntent().getIntExtra("position",0));
// setResult(RESULT_OK,intent);
}
if(Config.IDENTITY==1){//家长看完要刷新列表
Intent intent =new Intent();
intent.putExtra("position",getIntent().getIntExtra("position",0));
setResult(RESULT_OK,intent);
}
}
... ...
... ... @@ -156,6 +156,9 @@ public class Fbzy_Activity extends BaseActivity {
TextView endTimeText;
@BindView(R.id.fw_time_text)
TextView fwTimeText;
@BindView(R.id.tv_remind)
TextView tv_remind;
private static final String TAG = "MyTag";
List<JxtImageEntity> picAndVideo = new ArrayList<>(); // 视频和图片
private static final int REQUEST_CODE = 0x00000011; // 图片
... ... @@ -198,7 +201,7 @@ public class Fbzy_Activity extends BaseActivity {
mediaPlayer = new MediaPlayer();
mediaPlayer.setLooping(false);
mediaPlayer.setVolume(0.5f, 0.5f);
isHaveTj.setEnabled(false);
isHaveTj.setEnabled(true);
Intent intent = getIntent();
if (intent.getStringExtra("zhuanfa") != null) {
String zhuanfa = intent.getStringExtra("zhuanfa");
... ... @@ -335,11 +338,11 @@ public class Fbzy_Activity extends BaseActivity {
if (isHaveTj.isEnabled()) {
isHaveTj.setEnabled(false);
endTime.setVisibility(View.GONE);
txTime.setVisibility(View.GONE);
tv_remind.setText("作业查看提醒时间");
} else {
isHaveTj.setEnabled(true);
endTime.setVisibility(View.VISIBLE);
txTime.setVisibility(View.VISIBLE);
tv_remind.setText("作业提交提醒时间");
}
}
});
... ...
... ... @@ -264,7 +264,6 @@ public class ZytjActivity extends BaseActivity {
@Override
public void onClick(View v) {
content = contentEd.getText().toString();
if (!content.equals("")) {
WaitDialog.show(ZytjActivity.this, "请稍候...");
ArrayList<String> videos = new ArrayList<>();
for (int i = 0; i < frequencyUrl.size(); i++) {
... ... @@ -289,8 +288,9 @@ public class ZytjActivity extends BaseActivity {
Toast.makeText(ZytjActivity.this, "提交成功", Toast.LENGTH_SHORT).show();
setResult(9527);
ZytjActivity.this.finish();
}else {
Toast.makeText(ZytjActivity.this, fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();
}
}
@Override
... ... @@ -300,11 +300,10 @@ public class ZytjActivity extends BaseActivity {
@Override
public void onComplete() {
WaitDialog.dismiss();
}
});
}
}
});
imageAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
... ...
... ... @@ -9,6 +9,7 @@ import android.os.Handler;
import android.os.Message;
import android.support.annotation.Nullable;
import android.support.v4.widget.NestedScrollView;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
... ... @@ -48,6 +49,7 @@ import com.yinhebairong.clasmanage.entity.TzxqEntity;
import com.yinhebairong.clasmanage.entity.VideoEntity;
import com.yinhebairong.clasmanage.entity.getStudentTaskInfoEntity;
import com.yinhebairong.clasmanage.m.M;
import com.yinhebairong.clasmanage.ui.jxt.activity.Bjwj.BjwjActivity2;
import com.yinhebairong.clasmanage.ui.jxt.fragment.Tz.TzimgAdapter;
import java.io.IOException;
... ... @@ -157,6 +159,7 @@ public class ZyxqPerActivity extends BaseActivity {
}
private void getData() {
WaitDialog.show((AppCompatActivity) ZyxqPerActivity.this, "请稍候...");
Api().getStudentTaskInfo(Config.Token, ZyId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
... ... @@ -178,6 +181,13 @@ public class ZyxqPerActivity extends BaseActivity {
tzTitleTv.setText(tzxqEntity.getData().getName());
pjText.setText(tzxqEntity.getData().getEvaluate_name());
tzXqlist.setText(tzxqEntity.getData().getTask_content());
if(tzxqEntity.getData().getTask_content().length()>200){
showBut.setVisibility(View.VISIBLE);
tzXqlist.setVisibility(View.GONE);
}else {
showBut.setVisibility(View.GONE);
tzXqlist.setVisibility(View.VISIBLE);
}
jlLsName.setText(tzxqEntity.getData().getTeacher_name());
jlBj.setText(tzxqEntity.getData().getClass_name());
jlTime.setText(tzxqEntity.getData().getDate());
... ... @@ -711,6 +721,11 @@ public class ZyxqPerActivity extends BaseActivity {
}
});
if(Config.IDENTITY==1){//家长看完要刷新列表
Intent intent =new Intent();
intent.putExtra("position",getIntent().getIntExtra("position",0));
setResult(RESULT_OK,intent);
}
}
}
... ... @@ -724,7 +739,7 @@ public class ZyxqPerActivity extends BaseActivity {
@Override
public void onComplete() {
WaitDialog.dismiss();
}
});
}
... ... @@ -1078,5 +1093,6 @@ public class ZyxqPerActivity extends BaseActivity {
mediaPlayer.release();
mediaPlayer = null;
}
myHandler.removeCallbacksAndMessages(null);
}
}
... ...
... ... @@ -309,6 +309,15 @@ public class Zyxq_Activity extends BaseActivity {
if (!StringUtils.isEmptyString(jxtEntity.getData().getDate())) {
dateText.setText(jxtEntity.getData().getDate());
}
if(jxtEntity.getData().getContent().length()>200){
showBut.setVisibility(View.VISIBLE);
contentTv.setVisibility(View.GONE);
}else {
showBut.setVisibility(View.GONE);
contentTv.setVisibility(View.VISIBLE);
}
String[] url = judgeString(jxtEntity.getData().getContent()); //超链接判断返回数组
String allUrl = jxtEntity.getData().getContent();
CharSequence charSequence;
... ... @@ -975,7 +984,7 @@ public class Zyxq_Activity extends BaseActivity {
myaudio.notifyDataSetChanged();
}
if (!TextUtils.isEmpty(contentStr)) {
edit_content.setText(contentStr);
// edit_content.setText(contentStr);
}
RecyclerView recyclerView = view.findViewById(R.id.item_rv);
recyclerView.setLayoutManager(new GridLayoutManager(this, 5));
... ...
... ... @@ -315,7 +315,7 @@ public class Hd_Rv_Fragment extends BaseFragment {
});
}
public static boolean DO_REFRESH = true;
public static boolean DO_REFRESH = false;
@Override
public void onResume() {
... ...
... ... @@ -2,6 +2,7 @@ package com.yinhebairong.clasmanage.ui.jxt.fragment.Tz;
import android.content.Intent;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
... ... @@ -143,7 +144,11 @@ public class Tz_Rv_Fragment extends BaseFragment {
List<TzlistJzEntity.DataBeanX.DataBean> dataBeans = adapter.getData();
Intent tzintent = new Intent(getContext(), TzxqActivity.class);
tzintent.putExtra("TzId", dataBeans.get(position).getId() + "");
startActivityForResult(tzintent, 100);
tzintent.putExtra("position",position);
getActivity().startActivityForResult(tzintent, 101);
// ((TzlistJzEntity.DataBeanX.DataBean) adapter.getData().get(position)).setIs_read(1);
// ((TzlistJzEntity.DataBeanX.DataBean) adapter.getData().get(position)).setStatus_text("已查看");
// adapter.notifyDataSetChanged();
}
});
}
... ... @@ -237,6 +242,7 @@ public class Tz_Rv_Fragment extends BaseFragment {
}
public void getParentDate(int type, String date) {
DebugLog.e("wkk4====" + DO_REFRESH);
Api().getTzJZlist(Config.Token, type, date)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
... ... @@ -252,7 +258,7 @@ public class Tz_Rv_Fragment extends BaseFragment {
List<TzlistJzEntity.DataBeanX.DataBean> data = tzlistJzEntity.getData().getData();
if (page == 1 || page == 0) {
dataRv.scrollToPosition(0);
mList.clear();
mjzList.clear();
}
mjzList.addAll(tzlistJzEntity.getData().getData());
page = tzlistJzEntity.getData().getCurrent_page() + 1;
... ... @@ -276,12 +282,13 @@ public class Tz_Rv_Fragment extends BaseFragment {
});
}
public static boolean DO_REFRESH = true;
public static boolean DO_REFRESH = false;
@Override
public void onResume() {
super.onResume();
if (DO_REFRESH) {
DebugLog.e("1wkk2====" + DO_REFRESH);
setParam(1);
DO_REFRESH = false;
}
... ... @@ -315,6 +322,19 @@ public class Tz_Rv_Fragment extends BaseFragment {
}
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 101) {//成功的查看，要刷新相应位置
if(Config.IDENTITY==1){
int position=data.getIntExtra("position",0);
((TzlistJzEntity.DataBeanX.DataBean) jxt_tz_jzAdapter.getData().get(position)).setIs_read(1);
((TzlistJzEntity.DataBeanX.DataBean) jxt_tz_jzAdapter.getData().get(position)).setStatus_text("已查看");
jxt_tz_jzAdapter.notifyDataSetChanged();
}
}
}
}
class Jxt_Tz_Adapter extends BaseQuickAdapter<JxttzEntity.DataBeanX.DataBean, BaseViewHolder> {
... ... @@ -358,7 +378,7 @@ class Jxt_Tz_Adapter extends BaseQuickAdapter<JxttzEntity.DataBeanX.DataBean, Ba
yellow_tv.setText(item.getView_num() + "");
gray_tv.setText("/" + item.getTotal_num());
helper.addOnClickListener(R.id.ck_lin);
state_tv.setText(item.getStatus_text());
state_tv.setText(item.getStatus_text());//已查看 未查看
// if (item.getUncomment_num().equals("")) {
// massage_num.setVisibility(View.GONE);
// } else {
... ... @@ -426,10 +446,18 @@ class Jxt_Tz_jzAdapter extends BaseQuickAdapter<TzlistJzEntity.DataBeanX.DataBea
ll_chakan.setVisibility(View.GONE);
helper.addOnClickListener(R.id.ck_lin);
state_tv.setText(item.getStatus_text());
if (item.getStatus() == 2) {
if (item.getIs_read() == 1) {//已读
massage_num.setVisibility(View.GONE);
} else {
massage_num.setText(1 + "");
massage_num.setVisibility(View.VISIBLE);
massage_num.setText("1");
}
// if (item.getStatus() == 2) {
// massage_num.setVisibility(View.GONE);
// } else {
// massage_num.setText(1 + "");
// }
}
}
... ...
... ... @@ -23,6 +23,7 @@ import com.yinhebairong.clasmanage.adapter.jxtadapter.Jxt_Zy_Adapter;
import com.yinhebairong.clasmanage.base.BaseFragment;
import com.yinhebairong.clasmanage.base.instant.Layout;
import com.yinhebairong.clasmanage.entity.JxtZyListEntity;
import com.yinhebairong.clasmanage.entity.TzlistJzEntity;
import com.yinhebairong.clasmanage.m.M;
import com.yinhebairong.clasmanage.ui.jxt.activity.Zy.Tjxq_Activity;
import com.yinhebairong.clasmanage.ui.jxt.activity.Zy.ZyxqPerActivity;
... ... @@ -113,7 +114,7 @@ public class ZY_Rv_Fragment extends BaseFragment {
}
private int page = 1;
public static boolean DO_REFRESH = true;
public static boolean DO_REFRESH = false;
/**
* 设置参数-请求
... ... @@ -121,7 +122,7 @@ public class ZY_Rv_Fragment extends BaseFragment {
* @param page 页
*/
private void setParam(int page) {
DebugLog.e("wkk2====" + DO_REFRESH);
DebugLog.e("wkk22====" + DO_REFRESH);
Calendar calendar = Calendar.getInstance();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
String dateString = simpleDateFormat.format(calendar.getTime());
... ... @@ -158,7 +159,8 @@ public class ZY_Rv_Fragment extends BaseFragment {
List<JxtZyListEntity.DataBeanX.DataBean> data = adapter.getData();
Intent intent = new Intent(getActivity(), ZyxqPerActivity.class);
intent.putExtra("ZyId", data.get(position).getDetail_id() + "");
startActivity(intent);
intent.putExtra("position", position);
getActivity().startActivityForResult(intent, 101);
}
}
});
... ... @@ -207,7 +209,7 @@ public class ZY_Rv_Fragment extends BaseFragment {
@Override
public void onNext(JxtZyListEntity jxtZyListEntity) {
if (jxtZyListEntity.getCode() == M.success) {
if(dataRv==null){
if (dataRv == null) {
return;
}
if (page == 1 || page == 0) {
... ... @@ -292,4 +294,15 @@ public class ZY_Rv_Fragment extends BaseFragment {
});
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 101) {//成功的查看，要刷新相应位置
if (Config.IDENTITY == 1) {
int position = data.getIntExtra("position", 0);
((JxtZyListEntity.DataBeanX.DataBean) jxt_zy_adapter.getData().get(position)).setIs_read(1);
jxt_zy_adapter.notifyDataSetChanged();
}
}
}
}
... ...
... ... @@ -231,7 +231,7 @@ public class PjfxActivity_per extends BaseActivity {
name.setText(getIntent().getStringExtra(M.StuName) + "");
M.Glide(getIntent().getStringExtra(M.StuImage) + "", cirTx, activity);
tb_a.setText(getIntent().getStringExtra(M.StuName) + "日常表现折线图");
tb_a.setText(getIntent().getStringExtra(M.StuName) + "日常表现对比图");
tb_b.setText(getIntent().getStringExtra(M.StuName) + "日常表现详细得分图");
pjfx_sj_rv = this.findViewById(R.id.pjfx_sj_recycler);
... ...
... ... @@ -95,8 +95,8 @@ public abstract class FbzyChooseDialog extends Dialog implements jsc.kit.wheel.b
/* 获奖级别数据 */
private void data() {
for (int i = 1; i <=30 ; i++) {
level.add(i+"");
for (int i = 1; i <= 30; i++) {
level.add(i + "");
}
WheelItem[] items = new WheelItem[level.size()];
for (int i = 0; i < level.size(); i++) {
... ... @@ -111,8 +111,8 @@ public abstract class FbzyChooseDialog extends Dialog implements jsc.kit.wheel.b
private void childItem() {
list.clear();
child.clear();
child.add("周");
child.add("天");
child.add("周");
child.add("时");
child.add("分");
WheelItem[] items = new WheelItem[child.size()];
... ... @@ -151,7 +151,7 @@ public abstract class FbzyChooseDialog extends Dialog implements jsc.kit.wheel.b
pos_A = wheelA.getSelectedIndex();
pos_B = wheelB.getSelectedIndex();
childItem();
M.log("wheel--B", wheelB.getSelectedIndex()+"----"+wheelA.getSelectedIndex());
M.log("wheel--B", wheelB.getSelectedIndex() + "----" + wheelA.getSelectedIndex());
} else {
pos_A = wheelA.getSelectedIndex();
pos_B = wheelB.getSelectedIndex();
... ...
... ... @@ -234,12 +234,12 @@
android:layout_marginRight="@dimen/dp_16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:saveEnabled="false"
android:saveEnabled="true"
android:src="@drawable/kaiguan_img_select"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="1px"
android:background="#F1F1F1"/>
<LinearLayout
android:id="@+id/end_time"
... ... @@ -275,7 +275,7 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="1px"
android:background="#F1F1F1"/>
<LinearLayout
android:id="@+id/tx_time"
... ... @@ -285,11 +285,12 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_remind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:layout_marginLeft="@dimen/dp_16"
android:text="作业查看/提交提醒时间"
android:text="作业提交提醒时间"
android:textColor="#F57F17"/>
<View
android:layout_width="0dp"
... ...
... ... @@ -175,6 +175,7 @@
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_16"
android:textColor="#8C9198"
android:textSize="@dimen/sp_12" />
... ... @@ -183,7 +184,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_17"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/dot_gray"
... ...
... ... @@ -48,7 +48,7 @@
android:background="@null"
android:hint="请输入账号"
android:maxLines="1"
android:text="13769183554"
android:text="13888777714"
android:textColor="@color/color_bdc4ce"
android:textSize="@dimen/sp_16" />
... ...
... ... @@ -91,7 +91,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_12"
android:text="李老师"
android:textColor="#3D444D"
android:textSize="@dimen/sp_16" />
<LinearLayout
... ... @@ -104,7 +103,6 @@
android:id="@+id/class_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="一年级一班"
android:textColor="#8C9198"
android:textSize="@dimen/sp_12" />
<TextView
... ... @@ -136,7 +134,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_20"
android:text="语文背诵"
android:textColor="#3D444D"
android:textSize="@dimen/sp_16" />
... ... @@ -153,10 +150,8 @@
android:id="@+id/content_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:layout_margin="@dimen/dp_15"
android:autoLink="web"
android:layout_marginRight="@dimen/dp_16"
android:text="数学:1、运动会期间,口述复习第四单元试卷,复习五单元以前，请访问。"
android:textColor="#5B5E63"
android:textSize="@dimen/sp_14" />
... ... @@ -185,6 +180,7 @@
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_17"
android:layout_marginBottom="@dimen/dp_20"
android:visibility="gone"
android:background="@drawable/dot_gray"
android:gravity="center">
... ...
... ... @@ -12,8 +12,9 @@
<LinearLayout
android:id="@+id/titie"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="45dp"
android:orientation="horizontal"
android:background="@color/white"
android:gravity="center_vertical"
>
... ... @@ -138,11 +139,9 @@
android:layout_marginLeft="@dimen/dp_15"
/>
<TextView
android:layout_marginTop="@dimen/dp_8"
android:visibility="gone"
android:id="@+id/tz_xqlist"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginLeft="@dimen/dp_15"
android:layout_margin="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="match_parent">
</TextView>
... ... @@ -171,6 +170,7 @@
<LinearLayout
android:id="@+id/show_but"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_16"
... ...
... ... @@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_15"
android:text="李慧日常表现折线图"
android:text="李慧日常表现对比图"
android:textColor="@color/color_3d444d"
android:textSize="@dimen/sp_15" />
... ...