我的医生界面查看附近医生查看附近医院布局调整

1 year ago · 1f529250a1
parent f6418d0e79
commit 1f529250a1
15 changed files with 122 additions and 166 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,3 +0,0 @@
 # Default ignored files
 /shelf/
 /workspace.xml
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
    <bytecodeTargetLevel target="1.8" />
  </component>
 </project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -1,22 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="testRunner" value="PLATFORM" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1-bin/bwlcbys1h7rz3272sye1xwiv6/gradle-6.7.1" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
            <option value="$PROJECT_DIR$/library-player" />
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
 </project>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@ -1,45 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="RemoteRepositoriesConfiguration">
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Maven Central repository" />
      <option name="url" value="https://repo1.maven.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jboss.community" />
      <option name="name" value="JBoss Community repository" />
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="BintrayJCenter" />
      <option name="name" value="BintrayJCenter" />
      <option name="url" value="https://jcenter.bintray.com/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="Google" />
      <option name="name" value="Google" />
      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven" />
      <option name="name" value="maven" />
      <option name="url" value="https://jitpack.io" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="C:\Users\wuti\AppData\Local\Android\Sdk\extras\google\m2repository" />
      <option name="name" value="C:\Users\wuti\AppData\Local\Android\Sdk\extras\google\m2repository" />
      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/google/m2repository" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="C:\Users\wuti\AppData\Local\Android\Sdk\extras\android\m2repository" />
      <option name="name" value="C:\Users\wuti\AppData\Local\Android\Sdk\extras\android\m2repository" />
      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="C:\Users\wuti\AppData\Local\Android\Sdk\extras\m2repository" />
      <option name="name" value="C:\Users\wuti\AppData\Local\Android\Sdk\extras\m2repository" />
      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository" />
    </remote-repository>
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="DesignSurface">
    <option name="filePathToZoomLevelMap">
      <map>
        <entry key="..\:/StudioProjects/UnionMedTV/app/src/main/res/layout/activity_hospital_detail.xml" value="0.1988536155202822" />
        <entry key="..\:/StudioProjects/UnionMedTV/app/src/main/res/layout/item_type_doctor_layout.xml" value="0.14594356261022928" />
      </map>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
    <option name="id" value="Android" />
  </component>
 </project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="RunConfigurationProducerService">
    <option name="ignoredProducers">
      <set>
        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
      </set>
    </option>
  </component>
 </project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
 </project>
--- a/app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java
@ -9,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -31,6 +32,7 @@ import com.unionmed.unionmedtv.utils.CacheUtil;
 import com.unionmed.unionmedtv.utils.LinearSpacingItemDecoration;
 import com.unionmed.unionmedtv.utils.MyGridLayoutManager;
 import com.unionmed.unionmedtv.utils.OnChildClickListener;
 import com.unionmed.unionmedtv.widgets.ImgConstraintLayout;
 import java.util.ArrayList;
 import java.util.List;
@ -47,7 +49,7 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
    private int startNum = 0;
    private int endNum = 10;
    private int selectPostion = 0;//当前列表item点击位置
-
+    private ImgConstraintLayout constraint;
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.fragment_my_doctor, container, false);
@ -70,37 +72,40 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
        });
        iv_doctor = view.findViewById(R.id.iv_doctor);
        iv_doctor.setOnClickListener(this);
        constraint=view.findViewById(R.id.constraint);
        View v=getActivity().findViewById(R.id.tv_my_doctor);
        constraint.setNextFocusLeftId(v.getId());
        iv_hospital = view.findViewById(R.id.iv_hospital);
        iv_hospital.setOnClickListener(this);
        recyclerView.setAdapter(contractedDoctorAdapter);
        recyclerView.addItemDecoration(new LinearSpacingItemDecoration(getActivity(), 24));
-        iv_doctor.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+//        iv_doctor.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
+//            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
+//            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
+//                if (hasFocus) {
-                    // 获取最后一个控件的位置
+//                    // 获取最后一个控件的位置
-                    Rect rect = new Rect();
+//                    Rect rect = new Rect();
-                    iv_doctor.getGlobalVisibleRect(rect);
+//                    iv_doctor.getGlobalVisibleRect(rect);
-
+//
-                    // 按下方向键时，如果焦点将离开最后一个控件，则阻止焦点失去
+//                    // 按下方向键时，如果焦点将离开最后一个控件，则阻止焦点失去
-                    iv_doctor.setOnKeyListener(new View.OnKeyListener() {
+//                    iv_doctor.setOnKeyListener(new View.OnKeyListener() {
-                        @Override
+//                        @Override
-                        public boolean onKey(View v, int keyCode, KeyEvent event) {
+//                        public boolean onKey(View v, int keyCode, KeyEvent event) {
-                            if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.getAction() == KeyEvent.ACTION_DOWN) {
+//                            if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.getAction() == KeyEvent.ACTION_DOWN) {
-                                View nextView = iv_doctor.focusSearch(View.FOCUS_DOWN);
+//                                View nextView = iv_doctor.focusSearch(View.FOCUS_DOWN);
-                                if (nextView == null) {
+//                                if (nextView == null) {
-                                    return true;
+//                                    return true;
-                                }
+//                                }
-                            }
+//                            }
-                            return false;
+//                            return false;
-                        }
+//                        }
-                    });
+//                    });
-                } else {
+//                } else {
-                    // 移除OnKeyListener，以便在此控件上正常使用
+//                    // 移除OnKeyListener，以便在此控件上正常使用
-                    iv_doctor.setOnKeyListener(null);
+//                    iv_doctor.setOnKeyListener(null);
-                }
+//                }
-            }
+//            }
-        });
+//        });
    }
    public void loadData() {
--- a/app/src/main/res/drawable/bg_focus_10.xml
+++ b/app/src/main/res/drawable/bg_focus_10.xml
@ -0,0 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
        <shape android:shape="rectangle">
            <stroke
                android:width="1dp"
                android:color="#FFFFFF" />
            <corners android:radius="10dp" />
        </shape>
    </item>
    <item
        android:bottom="1dp"
        android:left="1dp"
        android:right="1dp"
        android:top="1dp">
        <shape android:shape="rectangle" >
            <stroke
                android:width="2dp"
                android:color="#000000" />
            <corners android:radius="10dp" />
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/bg_focus_selector_10.xml
+++ b/app/src/main/res/drawable/bg_focus_selector_10.xml
@ -0,0 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@drawable/bg_focus_10" android:state_focused="true"/>
 </selector>
--- a/app/src/main/res/layout/fragment_my_doctor.xml
+++ b/app/src/main/res/layout/fragment_my_doctor.xml
@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
    android:descendantFocusability="blocksDescendants">
    <LinearLayout
        android:layout_width="match_parent"
@ -17,63 +19,93 @@
            app:layout_constraintLeft_toLeftOf="parent"
            app:layout_constraintTop_toTopOf="parent">
-            <RelativeLayout
+            <com.unionmed.unionmedtv.widgets.ImgConstraintLayout
                android:id="@+id/constraint"
                style="@style/FocusStyle"
                android:layout_width="0dp"
-                android:layout_height="230dp"
+                android:layout_height="190dp"
-                android:layout_weight="1"
+                android:layout_marginTop="20dp"
-                android:gravity="center">
+                android:layout_marginRight="20dp"
                android:nextFocusLeft="@null"
                android:layout_weight="1">
                <ImageView
                    android:id="@+id/iv_doctor"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerInParent="true"
                    android:background="@drawable/bg_nearby_select"
                    android:focusable="true"
                    android:nextFocusRight="@+id/iv_hospital"
                    android:nextFocusLeft="@null"
                    android:scaleType="fitXY"
-                    android:src="@drawable/bg_nearby_doctor_select" />
+                    android:src="@mipmap/icon_nearby_doctor"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintLeft_toLeftOf="parent"
                    app:layout_constraintRight_toRightOf="parent"
                    app:layout_constraintTop_toTopOf="parent" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_alignParentRight="true"
                    android:layout_centerVertical="true"
                    android:layout_marginRight="76dp"
                    android:text="查看附近医生"
                    android:textColor="#fff1f1f1"
-                    android:textSize="24sp" />
+                    android:textSize="24sp"
-            </RelativeLayout>
+                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintRight_toRightOf="parent"
                    app:layout_constraintTop_toTopOf="parent" />
                <View
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:background="@drawable/bg_focus_selector_10"
                    android:duplicateParentState="true"
                    android:scaleType="fitXY"
                    app:layout_constraintLeft_toLeftOf="parent"
                    app:layout_constraintRight_toRightOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
                    tools:ignore="ContentDescription" />
            </com.unionmed.unionmedtv.widgets.ImgConstraintLayout>
-            <RelativeLayout
+            <com.unionmed.unionmedtv.widgets.ImgConstraintLayout
                style="@style/FocusStyle"
                android:layout_width="0dp"
-                android:layout_height="230dp"
+                android:layout_height="190dp"
-                android:layout_weight="1"
+                android:layout_marginTop="20dp"
-                android:gravity="center_vertical">
+                android:nextFocusRight="@null"
                android:layout_weight="1">
                <ImageView
                    android:id="@+id/iv_hospital"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
+                    android:scaleType="fitXY"
-                    android:background="@drawable/bg_nearby_select"
+                    android:src="@mipmap/icon_nearby_hospital"
-                    android:focusable="true"
+                    app:layout_constraintBottom_toBottomOf="parent"
-                    android:nextFocusLeft="@+id/iv_doctor"
+                    app:layout_constraintLeft_toLeftOf="parent"
-                    android:nextFocusRight="@null"
+                    app:layout_constraintRight_toRightOf="parent"
-                    android:src="@mipmap/icon_nearby_hospital" />
+                    app:layout_constraintTop_toTopOf="parent" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_alignParentRight="true"
                    android:layout_centerVertical="true"
                    android:layout_marginRight="76dp"
                    android:text="查看附近医院"
                    android:textColor="#fff1f1f1"
-                    android:textSize="24sp" />
+                    android:textSize="24sp"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintRight_toRightOf="parent"
                    app:layout_constraintTop_toTopOf="parent" />
-            </RelativeLayout>
+
                <View
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:background="@drawable/bg_focus_selector_10"
                    android:duplicateParentState="true"
                    android:scaleType="fitXY"
                    app:layout_constraintLeft_toLeftOf="parent"
                    app:layout_constraintRight_toRightOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
                    tools:ignore="ContentDescription" />
            </com.unionmed.unionmedtv.widgets.ImgConstraintLayout>
        </LinearLayout>
--- a/app/src/main/res/mipmap-xhdpi/icon_hang_up.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_hang_up.png
--- a/app/src/main/res/mipmap-xhdpi/icon_mute.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_mute.png
--- a/app/src/main/res/mipmap-xhdpi/icon_put_through.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_put_through.png
--- a/app/src/main/res/mipmap-xhdpi/icon_turn_off_camera.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_turn_off_camera.png