.gitignore

@@ -1,98 +1,15 @@
-
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
+/.idea/caches
 /.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
 /build
+/app/build/
 /captures
 .externalNativeBuild
-.idea
+/app/build/
-/.idea
-*/build
-*/.svn
-/.svn
-/app/src/main/java/com/admin/greendaodemo/db/gen/DaoMaster.java
-/app/src/main/java/com/admin/greendaodemo/db/gen/MSGDao.java
-.svn
-/app/src/main/res/layout/activity_outpatient_detail.xml
-
-# Built application files
-*.apk
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
-
-# Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
-
-# Version control
-vcs.xml
-
-# lint
-lint/intermediates/
-lint/generated/
-lint/outputs/
-lint/tmp/
-# lint/reports/
-!<path_to_libs>

app/src/main/java/com/unionmed/unionmedtv/activity/HospitalDetailActivity.java

@@ -114,7 +114,6 @@ public class HospitalDetailActivity extends BaseActivity {
                                 tv_hospital_brief.setText("医院简介: " + data.getChosjj());
                                 list.addAll(data.getPersoninfo());
                                 doctorAdapter.notifyDataSetChanged();
-                                doctorAdapter.setHospitalName(data.getChosName());
                             }
                         }
                     }

app/src/main/java/com/unionmed/unionmedtv/adapter/DoctorAdapter.java

@@ -105,13 +105,13 @@ public class DoctorAdapter extends BaseDelegateMultiAdapter<GetNearDoctorApi.Doc
             } else {
                 iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
             }
-//            TextView tv_distance = vh.getView(R.id.tv_distance);
+            TextView tv_distance = vh.getView(R.id.tv_distance);
-//            if (TextUtils.isEmpty(memberBean.getDistance())) {
+            if (TextUtils.isEmpty(memberBean.getDistance())) {
-//                tv_distance.setVisibility(View.GONE);
+                tv_distance.setVisibility(View.GONE);
-//            } else {
+            } else {
-//                tv_distance.setVisibility(View.VISIBLE);
+                tv_distance.setVisibility(View.VISIBLE);
-//                tv_distance.setText(memberBean.getDistance());
+                tv_distance.setText(memberBean.getDistance());
-//            }
+            }
         }
         vh.itemView.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalDoctorAdapter.java

@@ -27,15 +27,6 @@ import java.util.List;
  */
 public class HospitalDoctorAdapter extends BaseQuickAdapter<GetHospitalDetailApi.DoctorsBean, BaseViewHolder> {
     private OnChildClickListener onChildClickListener;
-    private String HospitalName="";
-
-    public String getHospitalName() {
-        return HospitalName;
-    }
-
-    public void setHospitalName(String hospitalName) {
-        HospitalName = hospitalName;
-    }
 
     public HospitalDoctorAdapter(int layoutResId, @Nullable List<GetHospitalDetailApi.DoctorsBean> data, OnChildClickListener onChildClickListener) {
         super(layoutResId, data);
@@ -88,8 +79,6 @@ public class HospitalDoctorAdapter extends BaseQuickAdapter<GetHospitalDetailApi
                 iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
             }
         }
-        TextView tv_hospital=vh.getView(R.id.tv_hospital);
-        tv_hospital.setText(HospitalName);
         TextView tv_distance = vh.getView(R.id.tv_distance);
         tv_distance.setVisibility(View.GONE);
         vh.itemView.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/unionmed/unionmedtv/login/activity/LoginActivity.java

@@ -63,12 +63,10 @@ public class LoginActivity extends FragmentActivity {
     public static final int LOCATION_CODE = 301;
     private LocationManager locationManager;
     private String locationProvider = null;
-
     public static void StartActivity(Context context){
         Intent intent=new Intent(context,LoginActivity.class);
         context.startActivity(intent);
     }
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -243,6 +241,7 @@ public class LoginActivity extends FragmentActivity {
             if (location != null) {
                 //如果位置发生变化，重新显示地理位置经纬度
                 Log.v("TAG", "监视地理位置变化-经纬度：" + location.getLongitude() + "   " + location.getLatitude());
+                //                    TODO 保存经纬度
                 CacheUtil.saveLongitude(location.getLongitude());
                 CacheUtil.saveLatitude(location.getLatitude());
             }
@@ -268,6 +267,7 @@ public class LoginActivity extends FragmentActivity {
                         }
                         Location location = locationManager.getLastKnownLocation(locationProvider);
                         if (location != null) {
+                            //                    TODO 保存经纬度
                             Log.v("TAG", "获取上次的位置-经纬度：" + location.getLongitude() + "   " + location.getLatitude());
                             CacheUtil.saveLongitude(location.getLongitude());
                             CacheUtil.saveLatitude(location.getLatitude());

app/src/main/res/layout/item_hospital_doctor_layout.xml

@@ -32,7 +32,7 @@
             android:layout_below="@+id/iv_photo"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="18dp"
-            tools:text="谢航宇"
+            android:text="谢航宇"
             android:textColor="#fff1f1f1"
             android:textSize="21sp" />
 
@@ -44,7 +44,7 @@
             android:layout_marginLeft="5dp"
             android:layout_marginTop="5dp"
             android:layout_toRightOf="@+id/tv_name"
-            tools:src="@drawable/icon_sex_boy" />
+            android:src="@drawable/icon_sex_boy" />
 
         <TextView
             android:id="@+id/tv_dept"
@@ -55,7 +55,7 @@
             android:ellipsize="end"
             android:gravity="center"
             android:singleLine="true"
-            tools:text=" 内科门诊｜主任医师"
+            android:text=" 内科门诊｜主任医师"
             android:textColor="#ffe1e1e1"
             android:textSize="13sp" />
 

app/src/main/res/layout/item_msg_image_left_layout.xml

@@ -14,7 +14,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginLeft="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
@@ -34,7 +34,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
@@ -60,7 +60,7 @@
             android:layout_height="300dp"
             android:layout_marginRight="130dp"
             android:scaleType="centerCrop"
-            tools:src="@drawable/search"
+            android:src="@drawable/search"
            />
 
         <View

app/src/main/res/layout/item_msg_image_right_layout.xml

@@ -14,7 +14,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginRight="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintRight_toLeftOf="@+id/iv_avatar"
@@ -34,7 +34,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
@@ -58,7 +58,7 @@
             android:layout_height="300dp"
             android:layout_marginLeft="130dp"
             android:background="@drawable/account_password_select"
-            tools:src="@mipmap/icon_search"
+            android:src="@mipmap/icon_search"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 

app/src/main/res/layout/item_msg_order_left_layout.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintlayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/FocusStyle"
-    android:descendantFocusability="afterDescendants">
+    android:descendantFocusability="afterDescendants"
+   >
 
     <ImageView
         android:id="@+id/iv_avatar"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginLeft="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_order_right_layout.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintlayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="afterDescendants"
-    style="@style/FocusStyle">
+    style="@style/FocusStyle"
+  >
 
     <ImageView
         android:id="@+id/iv_avatar"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginRight="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintRight_toLeftOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_text_left_layout.xml

@@ -13,7 +13,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginLeft="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_text_right_layout.xml

@@ -12,7 +12,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginRight="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintRight_toLeftOf="@+id/iv_avatar"
@@ -32,7 +32,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_unknown_left_layout.xml

@@ -13,7 +13,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginLeft="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_unknown_right_layout.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintlayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="afterDescendants"
-    style="@style/FocusStyle">
+    style="@style/FocusStyle"
+  >
 
     <ImageView
         android:id="@+id/iv_avatar"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginRight="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintRight_toLeftOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_video_left_layout.xml

@@ -13,7 +13,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginLeft="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_msg_video_right_layout.xml

@@ -13,7 +13,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginRight="47dp"
-        tools:src="@color/design_default_color_background"
+        android:src="@color/design_default_color_background"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="通知"
+        android:text="通知"
         android:textColor="@color/white_f1f1f1"
         android:textSize="21sp"
         app:layout_constraintRight_toLeftOf="@+id/iv_avatar"
@@ -33,7 +33,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="12dp"
-        tools:text="2023-05-30 26:30:25"
+        android:text="2023-05-30 26:30:25"
         android:textColor="@color/white_f1f1f1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

app/src/main/res/layout/item_type_doctor_layout.xml

@@ -51,7 +51,7 @@
             android:layout_centerHorizontal="true"
             android:background="@drawable/shape_corner15_color_0bbac6"
             android:gravity="center"
-            tools:text="在线"
+            android:text="在线"
             android:textColor="@color/colorWhite" />
 
         <TextView
@@ -61,7 +61,7 @@
             android:layout_below="@+id/iv_photo"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="18dp"
-            tools:text="谢航宇"
+            android:text="谢航宇"
             android:textColor="#fff1f1f1"
             android:textSize="21sp" />
 
@@ -84,7 +84,7 @@
             android:ellipsize="end"
             android:gravity="center"
             android:singleLine="true"
-            tools:text=" 内科门诊｜主任医师"
+            android:text=" 内科门诊｜主任医师"
             android:textColor="#ffe1e1e1"
             android:textSize="13sp" />
 
@@ -94,10 +94,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/tv_dept"
             android:layout_marginTop="10dp"
-            android:singleLine="true"
-            android:ellipsize="end"
             android:gravity="center"
-            tools:text="泗阳县来安医院"
+            android:text="泗阳县来安医院"
             android:textColor="#ffe1e1e1"
             android:textSize="13sp" />
     </RelativeLayout>

app/src/main/res/layout/item_type_hospital_layout.xml

@@ -36,7 +36,7 @@
             android:layout_marginRight="21dp"
             android:maxLines="2"
             android:ellipsize="end"
-            tools:text="福建医科大学附属协和 医院"
+            android:text="福建医科大学附属协和 医院"
             android:textSize="23sp"
             android:textColor="@color/white_f1f1f1" />
 
@@ -51,7 +51,7 @@
             android:gravity="center"
             android:textColor="@color/white_f1f1f1"
             android:background="@drawable/bg_btn_grade_radius_5"
-            tools:text="二级甲等"/>
+            android:text="二级甲等"/>
 
         <TextView
             android:visibility="gone"
@@ -86,7 +86,7 @@
             android:layout_marginRight="21dp"
             android:layout_below="@+id/iv_hospital_icon"
             android:layout_toRightOf="@+id/tv_address"
-            tools:text="福建省福州市新权路29号福建省福州市新权路29号"
+            android:text="福建省福州市新权路29号福建省福州市新权路29号"
             android:textColor="@color/white_f1f1f1"
             android:textSize="18sp"
             />