diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java index 0e9ceb8..9be535d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java @@ -22,7 +22,7 @@ import retrofit2.Response; * Created by ruihong on 2018/1/2. */ -public class DJPxKjglActivity extends BaseActivity implements View.OnClickListener { +public class DJPxKjglActivity extends BaseActivity { ListView lv; @@ -44,31 +44,32 @@ public class DJPxKjglActivity extends BaseActivity implements View.OnClickListen initToolbar("课件管理", "新增课件", new View.OnClickListener() { @Override public void onClick(View v) { - + Intent intent = new Intent(DJPxKjglActivity.this, DJUploadKJInfoActivity.class); + startActivity(intent); } }); } - @Override - public void onClick(View v) { - if(v.getId()==R.id.iv_left){ - finish(); - } - if(v.getId()==R.id.tv_right){ - Intent intent = new Intent(DJPxKjglActivity.this, DJUploadKJInfoActivity.class); - startActivity(intent); - } -// switch (v.getId()) { -// case R.id.iv_left: -// finish(); -// break; -// case R.id.tv_right: -// Intent intent = new Intent(DJPxKjglActivity.this, DJUploadKJInfoActivity.class); -// startActivity(intent); -// break; +// @Override +// public void onClick(View v) { +// if(v.getId()==R.id.iv_left){ +// finish(); // } - } +// if(v.getId()==R.id.tv_right){ +// Intent intent = new Intent(DJPxKjglActivity.this, DJUploadKJInfoActivity.class); +// startActivity(intent); +// } +//// switch (v.getId()) { +//// case R.id.iv_left: +//// finish(); +//// break; +//// case R.id.tv_right: +//// Intent intent = new Intent(DJPxKjglActivity.this, DJUploadKJInfoActivity.class); +//// startActivity(intent); +//// break; +//// } +// } @Override public void initData() { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkckActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkckActivity.java index 3e31f51..5b24da3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkckActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkckActivity.java @@ -60,7 +60,7 @@ public class GzqkckActivity extends BaseActivity2 { tvStarttime.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DatePickerDialog dialog = new DatePickerDialog(context, (view1, year, month, dayOfMonth) -> { + DatePickerDialog dialog = new DatePickerDialog(context, R.style.MyDatePickerDialogTheme, (view1, year, month, dayOfMonth) -> { c.set(year, month, dayOfMonth); tvStarttime.setText(new SimpleDateFormat("yyyy-MM-dd").format(c.getTime())); @@ -72,7 +72,7 @@ public class GzqkckActivity extends BaseActivity2 { tvEndtime.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DatePickerDialog dialog1 = new DatePickerDialog(context, (view12, year, month, dayOfMonth) -> { + DatePickerDialog dialog1 = new DatePickerDialog(context, R.style.MyDatePickerDialogTheme, (view12, year, month, dayOfMonth) -> { c.set(year, month, dayOfMonth); tvEndtime.setText(new SimpleDateFormat("yyyy-MM-dd").format(c.getTime())); }, c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DAY_OF_MONTH)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index fb363a5..8aad8e6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -254,6 +254,21 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("ZHPS_Admin") // binding.etPassword.setText("Rehome.zhps@2020") +// binding.etUsername.setText("310720") +// binding.etPassword.setText("Fhz0627,") +// +// binding.etUsername.setText("310480") +// binding.etPassword.setText("@Lst147258") +// +// +// binding.etUsername.setText("310063") +// binding.etPassword.setText("ZHPs@040909") +// +// binding.etUsername.setText("310440") +// binding.etPassword.setText("Qch@123456") + + //select * from u_account where account_fullusername='郑佩璋' + // binding.etUsername.setText("310353") @@ -264,7 +279,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("Abcd*1234") // binding.etUsername.setText("990001") -// binding.etPassword.setText("Bwfb@123") +// binding.etPassword.setTex0t("Bwfb@123") // binding.etUsername.setText("310295") // binding.etPassword.setText("Whk363521!") @@ -274,7 +289,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //吴云强 // binding.etUsername.setText("310430") -// binding.etPassword.setText("Laq**201610") +// binding.etPassword.setText("Laq***201610") //马 // binding.etUsername.setText("310482") @@ -310,7 +325,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //李耿 // binding.etUsername.setText("310261") -// binding.etPassword.setText("!LLg770731") +// binding.etPassword.setText("!LLg19770731") // binding.etUsername.setText("310534") // binding.etPassword.setText("abCd*1234") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XmjdActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XmjdActivity.java index 6d9b54c..5331608 100755 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XmjdActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XmjdActivity.java @@ -70,7 +70,7 @@ public class XmjdActivity extends BaseActivity { tvStarttime.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DatePickerDialog dialog = new DatePickerDialog(context, new DatePickerDialog.OnDateSetListener() { + DatePickerDialog dialog = new DatePickerDialog(context, R.style.MyDatePickerDialogTheme,new DatePickerDialog.OnDateSetListener() { @Override public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { @@ -85,7 +85,7 @@ public class XmjdActivity extends BaseActivity { tvEndttime.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DatePickerDialog dialog = new DatePickerDialog(context, new DatePickerDialog.OnDateSetListener() { + DatePickerDialog dialog = new DatePickerDialog(context, R.style.MyDatePickerDialogTheme, new DatePickerDialog.OnDateSetListener() { @Override public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java index 1d75403..58d220e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java @@ -51,8 +51,8 @@ public class ZddbgzinfoActivity extends BaseActivity implements View.OnClickList ilDbld = findViewById(R.id.il_dbld); ilDblx = findViewById(R.id.il_dblx); ilGzfzbm = findViewById(R.id.il_gzfzbm); - ilZrr = findViewById(R.id.il_lrr); - ilAplx = findViewById(R.id.il_zrr); + ilZrr = findViewById(R.id.il_zrr); + ilAplx = findViewById(R.id.il_aplx); ilHylx = findViewById(R.id.il_hylx); ilTcsj = findViewById(R.id.il_tcsj); ilWcsj = findViewById(R.id.il_wcsj); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java index 43bf272..9e84694 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java @@ -53,8 +53,8 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen ilDbld = findViewById(R.id.il_dbld); ilDblx = findViewById(R.id.il_dblx); ilGzfzbm = findViewById(R.id.il_gzfzbm); - ilZrr = findViewById(R.id.il_lrr); - ilAplx = findViewById(R.id.il_zrr); + ilZrr = findViewById(R.id.il_zrr); + ilAplx = findViewById(R.id.il_aplx); ilHylx = findViewById(R.id.il_hylx); ilTcsj = findViewById(R.id.il_tcsj); ilWcsj = findViewById(R.id.il_wcsj); @@ -227,7 +227,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen ilTcsj.setTvContentOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DatePickerDialog dialog = new DatePickerDialog(context, new DatePickerDialog.OnDateSetListener() { + DatePickerDialog dialog = new DatePickerDialog(context, R.style.MyDatePickerDialogTheme, new DatePickerDialog.OnDateSetListener() { @Override public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { @@ -242,7 +242,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen ilWcsj.setTvContentOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DatePickerDialog dialog = new DatePickerDialog(context, new DatePickerDialog.OnDateSetListener() { + DatePickerDialog dialog = new DatePickerDialog(context, R.style.MyDatePickerDialogTheme, new DatePickerDialog.OnDateSetListener() { @Override public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { diff --git a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt b/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt index 612cb56..c358edd 100644 --- a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt +++ b/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.kt @@ -285,7 +285,7 @@ class GridViewDialog(context:Context) : Dialog(context) { GridItem( "三会一课", R.drawable.icon_qdmeet, - getShowString("Branch_PartyMemberMeet") + getShowString("DJSHYK") //DJSHYK Branch_PartyMemberMeet ) ) datas.add( @@ -299,7 +299,7 @@ class GridViewDialog(context:Context) : Dialog(context) { GridItem( "党建课件", R.drawable.icon_kjgl, - getShowString("STUDYXT_ZRGL_KJGL_PS") + getShowString("STUDYXT_ZRGL_KJGL_PS")//Branch_PartyClass //STUDYXT_ZRGL_KJGL_PS ) ) datas.add(GridItem("党龄", R.drawable.icon_dj, getShowString("YGKQGL_SQGL"))) diff --git a/app/src/main/res/layout/fragment_practiceinfo.xml b/app/src/main/res/layout/fragment_practiceinfo.xml index a7c6e4a..e68ff8a 100644 --- a/app/src/main/res/layout/fragment_practiceinfo.xml +++ b/app/src/main/res/layout/fragment_practiceinfo.xml @@ -178,6 +178,7 @@ android:layout_marginBottom="10dp" android:background="@drawable/btn_add_slipt" android:padding="5dp" + android:textColor="#999999" android:text="添加分隔符^" android:textSize="15sp" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 732fee2..a795c07 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -201,4 +201,12 @@ + +