diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/ChatDoctorAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/ChatDoctorAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/ChatDoctorAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/ChatDoctorAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/ChatPatientAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/ChatPatientAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/ChatPatientAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/ChatPatientAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/doctorAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/DoctorAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/doctorAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/DoctorAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/DoctorMsgAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/DoctorMsgAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/DoctorMsgAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/DoctorMsgAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/controller/Adapter/FragmentAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/FragmentAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/controller/Adapter/FragmentAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/FragmentAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/huatiAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/HuatiAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/huatiAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/HuatiAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/patientAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/PatientAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/patientAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/PatientAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/PatientMsgAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/PatientMsgAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/PatientMsgAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/PatientMsgAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/symptomaticAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/SymptomaticAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/symptomaticAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/SymptomaticAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/util/symptomaticsiteAdapter.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/SymptomaticsiteAdapter.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/util/symptomaticsiteAdapter.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/adapter/SymptomaticsiteAdapter.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/add_hospital.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackAddHospital.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/add_hospital.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackAddHospital.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/add_huati.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackAddHuati.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/add_huati.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackAddHuati.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Doctor_info.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackDoctorInfo.java similarity index 71% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Doctor_info.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackDoctorInfo.java index 8a3e5ed2edd7b9fc701c46e379341d4520d0ab59..1ddf267e65f661f8acb5591ba918b742bdcd7bf1 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Doctor_info.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackDoctorInfo.java @@ -6,7 +6,7 @@ import android.view.View; import android.widget.TextView; import com.linwankaifa.linwancunyi.R; -import com.linwankaifa.linwancunyi.helper.Data_whole; +import com.linwankaifa.linwancunyi.util.Data_whole; public class Doctor_info extends AppCompatActivity { @@ -21,11 +21,11 @@ public class Doctor_info extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_doctor_info); - tvName = (TextView)findViewById(R.id.back_doctor_name); - tvAge = (TextView)findViewById(R.id.back_doctor_age); - tvSex = (TextView)findViewById(R.id.back_doctor_sex); - tvDepartment = (TextView)findViewById(R.id.back_doctor_department); - tvPosition = (TextView)findViewById(R.id.back_doctor_position); + tvName = (TextView) findViewById(R.id.back_doctor_name); + tvAge = (TextView) findViewById(R.id.back_doctor_age); + tvSex = (TextView) findViewById(R.id.back_doctor_sex); + tvDepartment = (TextView) findViewById(R.id.back_doctor_department); + tvPosition = (TextView) findViewById(R.id.back_doctor_position); tvName.setText(Data_whole.getDoctorBean().getDoctorname()); tvAge.setText(String.valueOf(Data_whole.getDoctorBean().getDoctorage())); diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/doctor_list.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackDoctorList.java similarity index 97% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/doctor_list.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackDoctorList.java index 66d3fe3b0746443c628b4880480d0486694cacfd..b5b3a754bf3d79c96c9dc8a7a8f1b5fe8bdc4c90 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/doctor_list.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackDoctorList.java @@ -12,9 +12,9 @@ import android.widget.Toast; import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.DoctorBean; -import com.linwankaifa.linwancunyi.helper.Data_whole; +import com.linwankaifa.linwancunyi.ui.Adapter.doctorAdapter; +import com.linwankaifa.linwancunyi.util.Data_whole; import com.linwankaifa.linwancunyi.util.JsonTransformation; -import com.linwankaifa.linwancunyi.util.doctorAdapter; import java.io.IOException; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Patient_info.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackPatientInfo.java similarity index 93% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Patient_info.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackPatientInfo.java index 52fb53d20523fa7799df68dded69a79717391d60..fec36e39e5885d707a55bd58b87d3b935f968ade 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Patient_info.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackPatientInfo.java @@ -8,7 +8,7 @@ import android.widget.TextView; import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.PatientBean; -import com.linwankaifa.linwancunyi.helper.Data_whole; +import com.linwankaifa.linwancunyi.util.Data_whole; public class Patient_info extends AppCompatActivity { TextView patient_name; @@ -20,12 +20,13 @@ public class Patient_info extends AppCompatActivity { TextView patient_birthday; String SHAREDPREFERENCES_NAME = "shared.xml"; SharedPreferences preferences; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_patient_info); patient_name = (TextView) findViewById(R.id.patient_name); - patient_petname= (TextView) findViewById(R.id.patient_petname); + patient_petname = (TextView) findViewById(R.id.patient_petname); patient_accountnumber = (TextView) findViewById(R.id.patient_accountnumber); patient_sex = (TextView) findViewById(R.id.patient_sex); patient_age = (TextView) findViewById(R.id.patient_age); diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/patient_list.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackPatientList.java similarity index 98% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/patient_list.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackPatientList.java index fba3b6488e323cb1ed195b8f3eec536831df76c0..ea0457e99a7c9b5522dd56ed904e532869d1c8bc 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/patient_list.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackPatientList.java @@ -12,9 +12,9 @@ import android.widget.Toast; import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.PatientBean; -import com.linwankaifa.linwancunyi.helper.Data_whole; +import com.linwankaifa.linwancunyi.ui.Adapter.patientAdapter; +import com.linwankaifa.linwancunyi.util.Data_whole; import com.linwankaifa.linwancunyi.util.JsonTransformation; -import com.linwankaifa.linwancunyi.util.patientAdapter; import java.io.IOException; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Statistical_information.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackStatisticalInformation.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/back/Statistical_information.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/back/BackStatisticalInformation.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/log_in.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/Login.java similarity index 98% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/login/log_in.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/login/Login.java index 50e6524a56c423d41d092f8dc5f2e3a4cb49ab15..2fad67c43b4fda990d4857cd0632e1029a03b95a 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/log_in.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/Login.java @@ -16,12 +16,12 @@ import com.linwankaifa.linwancunyi.bean.DoctorBean; import com.linwankaifa.linwancunyi.bean.ManagerBean; import com.linwankaifa.linwancunyi.bean.PatientBean; import com.linwankaifa.linwancunyi.bean.TokenCharactor; -import com.linwankaifa.linwancunyi.helper.Data_whole; -import com.linwankaifa.linwancunyi.helper.Md5Util; import com.linwankaifa.linwancunyi.ui.back.BackstageFunction; import com.linwankaifa.linwancunyi.ui.doctor.DoctorFunction; import com.linwankaifa.linwancunyi.ui.patient.PatientMain; +import com.linwankaifa.linwancunyi.util.Data_whole; import com.linwankaifa.linwancunyi.util.JsonTransformation; +import com.linwankaifa.linwancunyi.util.Md5Util; import java.io.IOException; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/choosecharcater.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginChooseCharcater.java similarity index 99% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/login/choosecharcater.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginChooseCharcater.java index 03d48d702ccc4e431564abc180f5cc96c94405dd..1b49707a41bcc015c5ac28a61544cb6fd880cd4c 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/choosecharcater.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginChooseCharcater.java @@ -13,10 +13,10 @@ import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.DoctorBean; import com.linwankaifa.linwancunyi.bean.ManagerBean; import com.linwankaifa.linwancunyi.bean.PatientBean; -import com.linwankaifa.linwancunyi.helper.Data_whole; import com.linwankaifa.linwancunyi.ui.back.BackstageFunction; import com.linwankaifa.linwancunyi.ui.doctor.DoctorFunction; import com.linwankaifa.linwancunyi.ui.patient.PatientMain; +import com.linwankaifa.linwancunyi.util.Data_whole; import com.linwankaifa.linwancunyi.util.JsonTransformation; import java.io.IOException; @@ -148,6 +148,7 @@ public class choosecharcater extends AppCompatActivity { editor.putString("usertype", "back"); editor.commit(); } + public boolean onKeyDown(int keyCode, KeyEvent event) { diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/forgetpassword.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginForgetPassword.java similarity index 99% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/login/forgetpassword.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginForgetPassword.java index 28d554b28d8f0a6ea353f510a0e777528b250643..fc85e5617e29f81b3416436aaa686f2cea5de236 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/forgetpassword.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginForgetPassword.java @@ -13,8 +13,8 @@ import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.DoctorBean; import com.linwankaifa.linwancunyi.bean.ManagerBean; import com.linwankaifa.linwancunyi.bean.PatientBean; -import com.linwankaifa.linwancunyi.helper.Md5Util; import com.linwankaifa.linwancunyi.util.JsonTransformation; +import com.linwankaifa.linwancunyi.util.Md5Util; import java.io.IOException; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/register.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginRegister.java similarity index 98% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/login/register.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginRegister.java index ce69817703df24c1eb887d32e740f0eb213fdb80..970d3a42d622bb4e3f39b1481a6ecf6f8750aaac 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/register.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/login/LoginRegister.java @@ -12,9 +12,9 @@ import android.widget.Toast; import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.DoctorBean; import com.linwankaifa.linwancunyi.bean.PatientBean; -import com.linwankaifa.linwancunyi.helper.Data_whole; -import com.linwankaifa.linwancunyi.helper.Md5Util; +import com.linwankaifa.linwancunyi.util.Data_whole; import com.linwankaifa.linwancunyi.util.JsonTransformation; +import com.linwankaifa.linwancunyi.util.Md5Util; import java.io.IOException; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/InformationChange.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientInformationChange.java similarity index 99% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/InformationChange.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientInformationChange.java index 6ee4b68ca895a4dab8515b9e1a2940b11be923d6..9fb2a15bf026514adca7f9a374fd12842c4afafa 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/InformationChange.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientInformationChange.java @@ -16,7 +16,7 @@ import com.linwankaifa.linwancunyi.R; import com.linwankaifa.linwancunyi.bean.DoctorBean; import com.linwankaifa.linwancunyi.bean.HospitalBean; import com.linwankaifa.linwancunyi.bean.PatientBean; -import com.linwankaifa.linwancunyi.helper.Data_whole; +import com.linwankaifa.linwancunyi.util.Data_whole; import com.linwankaifa.linwancunyi.util.JsonTransformation; import java.io.IOException; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/Tab_lifeStyle.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientTabLifeStyle.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/Tab_lifeStyle.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientTabLifeStyle.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/Tab_personData.java b/app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientTabPersonData.java similarity index 100% rename from app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/Tab_personData.java rename to app/src/main/java/com/linwankaifa/linwancunyi/ui/patient/PatientTabPersonData.java diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/helper/BottomNavigationViewHelper.java b/app/src/main/java/com/linwankaifa/linwancunyi/util/BottomNavigationViewHelper.java similarity index 96% rename from app/src/main/java/com/linwankaifa/linwancunyi/helper/BottomNavigationViewHelper.java rename to app/src/main/java/com/linwankaifa/linwancunyi/util/BottomNavigationViewHelper.java index 9a75448ef9d1892743bfda9376a84c912ca9fa2d..f7ce8ca545c638307e3a663a295413896bb3a6ef 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/helper/BottomNavigationViewHelper.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/util/BottomNavigationViewHelper.java @@ -1,4 +1,4 @@ -package com.linwankaifa.linwancunyi.helper; +package com.linwankaifa.linwancunyi.util; import android.support.design.internal.BottomNavigationItemView; import android.support.design.internal.BottomNavigationMenuView; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/helper/Data_whole.java b/app/src/main/java/com/linwankaifa/linwancunyi/util/Data_whole.java similarity index 98% rename from app/src/main/java/com/linwankaifa/linwancunyi/helper/Data_whole.java rename to app/src/main/java/com/linwankaifa/linwancunyi/util/Data_whole.java index 52d01a2cf26c661d84f4b9fc972660e05909a0fc..f12dd492f57c584bb9fae41be7c391946267f68e 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/helper/Data_whole.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/util/Data_whole.java @@ -1,4 +1,4 @@ -package com.linwankaifa.linwancunyi.helper; +package com.linwankaifa.linwancunyi.util; import com.linwankaifa.linwancunyi.bean.ChatrecordBean; import com.linwankaifa.linwancunyi.bean.DoctorBean; diff --git a/app/src/main/java/com/linwankaifa/linwancunyi/helper/Md5Util.java b/app/src/main/java/com/linwankaifa/linwancunyi/util/Md5Util.java similarity index 69% rename from app/src/main/java/com/linwankaifa/linwancunyi/helper/Md5Util.java rename to app/src/main/java/com/linwankaifa/linwancunyi/util/Md5Util.java index 45f0c5228112e266230461cb90c55f05241b4251..12a28e995b4b3d3daaab76424ee29eb85b2308be 100644 --- a/app/src/main/java/com/linwankaifa/linwancunyi/helper/Md5Util.java +++ b/app/src/main/java/com/linwankaifa/linwancunyi/util/Md5Util.java @@ -1,4 +1,4 @@ -package com.linwankaifa.linwancunyi.helper; +package com.linwankaifa.linwancunyi.util; /** * Created by 邹京汕 on 2019/7/14. @@ -7,24 +7,20 @@ package com.linwankaifa.linwancunyi.helper; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -public class Md5Util -{ +public class Md5Util { static String[] chars = - { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" }; + {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"}; - public static String StringInMd5(String str) - { + public static String StringInMd5(String str) { MessageDigest md5 = null; - try - { + try { md5 = MessageDigest.getInstance("md5"); byte[] result = md5.digest(str.getBytes()); StringBuilder sb = new StringBuilder(32); - for (int i = 0; i < result.length; i++) - { + for (int i = 0; i < result.length; i++) { byte x = result[i]; // 取得高位 int h = 0x0f & (x >>> 4); @@ -34,11 +30,11 @@ public class Md5Util } return sb.toString(); - } catch (NoSuchAlgorithmException e) - { + } catch (NoSuchAlgorithmException e) { throw new RuntimeException(e); } } + public static void main(String[] args) { System.out.println(Md5Util.StringInMd5("123456")); }