LiuFuhua / Laryngoscope

Go to a project
Toggle navigation Toggle navigation pinning
liufuhua007
5184b0ca 1 parent 40fbbff0

修改重构的bug

Inline Side-by-side
Showing 8 changed files with 34 additions and 33 deletions
...@@ -13,7 +13,7 @@ android { ...@@ -13,7 +13,7 @@ android {
13 13
14 defaultConfig { 14 defaultConfig {
15 applicationId "com.sw.laryngoscope" 15 applicationId "com.sw.laryngoscope"
16 - minSdkVersion 23 16 + minSdkVersion 24
17 targetSdkVersion 30 17 targetSdkVersion 30
18 versionCode vcode 18 versionCode vcode
19 versionName "V" + version + "_" + getVersionName() 19 versionName "V" + version + "_" + getVersionName()
...@@ -61,8 +61,8 @@ android { ...@@ -61,8 +61,8 @@ android {
61 } 61 }
62 } 62 }
63 compileOptions { 63 compileOptions {
64 - sourceCompatibility JavaVersion.VERSION_1_7 64 + sourceCompatibility JavaVersion.VERSION_11
65 - targetCompatibility JavaVersion.VERSION_1_8 65 + targetCompatibility JavaVersion.VERSION_11
66 } 66 }
67 67
68 //自动生成指定名称的release发布版的 apk文件 68 //自动生成指定名称的release发布版的 apk文件
...@@ -114,7 +114,7 @@ dependencies { ...@@ -114,7 +114,7 @@ dependencies {
114 114
115 //noinspection GradleCompatible 115 //noinspection GradleCompatible
116 implementation 'com.android.support:recyclerview-v7:23.4.0' 116 implementation 'com.android.support:recyclerview-v7:23.4.0'
117 - implementation files('libs/org.litepal.guolin_3.2.3.jar') 117 +// implementation files('libs/org.litepal.guolin_3.2.3.jar')
118 118
119 119
120 implementation 'com.google.code.gson:gson:2.8.5' 120 implementation 'com.google.code.gson:gson:2.8.5'
...@@ -138,14 +138,14 @@ dependencies { ...@@ -138,14 +138,14 @@ dependencies {
138 // implementation files('libs\\signature-pad.jar') 138 // implementation files('libs\\signature-pad.jar')
139 // implementation 'com.github.gcacace:signature-pad:1.3.1' // 或最新版本 139 // implementation 'com.github.gcacace:signature-pad:1.3.1' // 或最新版本
140 implementation 'com.github.mhiew:android-pdf-viewer:3.2.0-beta.1' 140 implementation 'com.github.mhiew:android-pdf-viewer:3.2.0-beta.1'
141 - implementation files('libs\\dcm4che-core-5.27.0.jar') 141 +// implementation files('libs\\dcm4che-core-5.27.0.jar')
142 - implementation files('libs\\dcm4che-net-5.27.0.jar') 142 +// implementation files('libs\\dcm4che-net-5.27.0.jar')
143 143
144 implementation project(":ffmpeg") 144 implementation project(":ffmpeg")
145 - implementation files('libs\\wifilibrary.jar') 145 +// implementation files('libs\\wifilibrary.jar')
146 146
147 147
148 compileOnly files('syslibs/framework.jar') 148 compileOnly files('syslibs/framework.jar')
149 149
150 - 150 +// implementation("com.google.android.fhir:engine:1.0.0")
151 } 151 }
......
...@@ -300,7 +300,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo ...@@ -300,7 +300,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo
300 break; 300 break;
301 } 301 }
302 binding.layoutUserList.getRoot().setVisibility(View.GONE); 302 binding.layoutUserList.getRoot().setVisibility(View.GONE);
303 - binding.layoutUserList.getRoot().setVisibility(View.VISIBLE); 303 + binding.layoutUserSwtich.getRoot().setVisibility(View.VISIBLE);
304 binding.layoutUserSwtich.edSwitchName.setText(curSelAcc.getName()); 304 binding.layoutUserSwtich.edSwitchName.setText(curSelAcc.getName());
305 binding.layoutUserSwtich.edSwitchName.setEnabled(false); 305 binding.layoutUserSwtich.edSwitchName.setEnabled(false);
306 binding.layoutUserSwtich.edSwitchPsd.setText(""); 306 binding.layoutUserSwtich.edSwitchPsd.setText("");
...@@ -326,7 +326,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo ...@@ -326,7 +326,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo
326 curSelAcc.setIsSelect(1); 326 curSelAcc.setIsSelect(1);
327 curSelAcc.saveOrUpdate("name = ?", curSelAcc.getName()); 327 curSelAcc.saveOrUpdate("name = ?", curSelAcc.getName());
328 AccountManager.getInstance().findAll(); 328 AccountManager.getInstance().findAll();
329 - MyApplication.showToastShort(getString(R.string.string_login_success)); 329 +// MyApplication.showToastShort(getString(R.string.string_login_success));
330 homeActivity.setUseName(); 330 homeActivity.setUseName();
331 homeActivity.showSettingIcon(); 331 homeActivity.showSettingIcon();
332 binding.layBack.performClick(); 332 binding.layBack.performClick();
...@@ -384,7 +384,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo ...@@ -384,7 +384,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo
384 binding.layoutUserList.getRoot().setVisibility(View.VISIBLE); 384 binding.layoutUserList.getRoot().setVisibility(View.VISIBLE);
385 binding.layoutUserNew.getRoot().setVisibility(View.GONE); 385 binding.layoutUserNew.getRoot().setVisibility(View.GONE);
386 binding.layoutUserEdit.getRoot().setVisibility(View.GONE); 386 binding.layoutUserEdit.getRoot().setVisibility(View.GONE);
387 - binding.layoutUserList.getRoot().setVisibility(View.GONE); 387 + binding.layoutUserSwtich.getRoot().setVisibility(View.GONE);
388 } 388 }
389 389
390 private void hideInput(View view) { 390 private void hideInput(View view) {
......
...@@ -58,7 +58,8 @@ import java.util.Iterator; ...@@ -58,7 +58,8 @@ import java.util.Iterator;
58 import java.util.List; 58 import java.util.List;
59 59
60 60
61 -public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> implements CustomTimer.TimerCallBack, DetailGdItemAdapter.OnClickLitener, 61 +public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> implements
62 + CustomTimer.TimerCallBack, DetailGdItemAdapter.OnClickLitener,
62 RadioGroup.OnCheckedChangeListener, StorageStateManager.MountCallBack, 63 RadioGroup.OnCheckedChangeListener, StorageStateManager.MountCallBack,
63 DetailCopyInfoPopWindow.copyCallback, SlidingCheckLayout.OnSlidingPositionListener, View.OnClickListener { 64 DetailCopyInfoPopWindow.copyCallback, SlidingCheckLayout.OnSlidingPositionListener, View.OnClickListener {
64 65
...@@ -118,6 +119,7 @@ public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> impl ...@@ -118,6 +119,7 @@ public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> impl
118 binding.txtVideoNum.setVisibility(View.VISIBLE); 119 binding.txtVideoNum.setVisibility(View.VISIBLE);
119 binding.txtVideoNumValue.setVisibility(View.VISIBLE); 120 binding.txtVideoNumValue.setVisibility(View.VISIBLE);
120 } 121 }
122 + mDetailGdItemAdapter.notifyDataSetChanged();
121 } 123 }
122 124
123 public void setMountCallBack() { 125 public void setMountCallBack() {
......
...@@ -189,11 +189,11 @@ public class ArchiveFragment extends BaseFragment<FgArchiveBinding> implements C ...@@ -189,11 +189,11 @@ public class ArchiveFragment extends BaseFragment<FgArchiveBinding> implements C
189 if ( userDb.getUserType() == InitParam.USER_TYPE_ADMIN ) { 189 if ( userDb.getUserType() == InitParam.USER_TYPE_ADMIN ) {
190 mFileListMg.curFoldLevel = InitParam.FOLDER_LEVEL.L_ONE.ordinal(); 190 mFileListMg.curFoldLevel = InitParam.FOLDER_LEVEL.L_ONE.ordinal();
191 mFileListMg.initList(); 191 mFileListMg.initList();
192 - binding.layoutArchiveFile.btnTimeSel.setVisibility(View.GONE); 192 + binding.layoutArchiveFile.layoutTimeSel.setVisibility(View.GONE);
193 binding.layoutArchiveFile.txtSearch.setVisibility(View.GONE); 193 binding.layoutArchiveFile.txtSearch.setVisibility(View.GONE);
194 } else { 194 } else {
195 selTwoFold(userDb.getName()); 195 selTwoFold(userDb.getName());
196 - binding.layoutArchiveFile.btnTimeSel.setVisibility(View.VISIBLE); 196 + binding.layoutArchiveFile.layoutTimeSel.setVisibility(View.VISIBLE);
197 binding.layoutArchiveFile.txtSearch.setVisibility(View.VISIBLE); 197 binding.layoutArchiveFile.txtSearch.setVisibility(View.VISIBLE);
198 } 198 }
199 } 199 }
......
...@@ -27,17 +27,14 @@ import java.util.List; ...@@ -27,17 +27,14 @@ import java.util.List;
27 public class DetailGdItemAdapter extends RecyclerView.Adapter<DetailGdItemAdapter.ViewHolder> { 27 public class DetailGdItemAdapter extends RecyclerView.Adapter<DetailGdItemAdapter.ViewHolder> {
28 28
29 private Context context; 29 private Context context;
30 -
31 private List<RecordInfoDB> list; 30 private List<RecordInfoDB> list;
32 public List<Boolean> checkList = new ArrayList<>(); 31 public List<Boolean> checkList = new ArrayList<>();
33 -
34 private LayoutInflater mInflater; 32 private LayoutInflater mInflater;
35 -
36 private OnClickLitener listener; 33 private OnClickLitener listener;
37 -
38 private ViewHolder viewHolder; 34 private ViewHolder viewHolder;
39 private View view; 35 private View view;
40 36
37 + @SuppressLint("NotifyDataSetChanged")
41 public void setList(List<RecordInfoDB> list) { 38 public void setList(List<RecordInfoDB> list) {
42 this.list = list; 39 this.list = list;
43 checkList.clear(); 40 checkList.clear();
...@@ -58,6 +55,7 @@ public class DetailGdItemAdapter extends RecyclerView.Adapter<DetailGdItemAdapte ...@@ -58,6 +55,7 @@ public class DetailGdItemAdapter extends RecyclerView.Adapter<DetailGdItemAdapte
58 } 55 }
59 } 56 }
60 57
58 + @SuppressLint("NotifyDataSetChanged")
61 public void setsingleCheck(int position) { 59 public void setsingleCheck(int position) {
62 checkList.set(list.size() - position - 1, !checkList.get(list.size() - position - 1)); 60 checkList.set(list.size() - position - 1, !checkList.get(list.size() - position - 1));
63 notifyDataSetChanged(); 61 notifyDataSetChanged();
......
...@@ -114,20 +114,19 @@ ...@@ -114,20 +114,19 @@
114 app:layout_constraintTop_toBottomOf="@+id/i_view_1" /> 114 app:layout_constraintTop_toBottomOf="@+id/i_view_1" />
115 115
116 116
117 - <!--<androidx.recyclerview.widget.RecyclerView 117 +<!-- <androidx.recyclerview.widget.RecyclerView-->
118 - android:id="@+id/gd_detail" 118 +<!-- android:id="@+id/gd_detail"-->
119 - android:layout_width="1021dp" 119 +<!-- android:layout_width="1021dp"-->
120 - android:layout_height="850dp" 120 +<!-- android:layout_height="850dp"-->
121 - android:numColumns="3" 121 +<!-- android:numColumns="3"-->
122 - android:horizontalSpacing="15dp" 122 +<!-- android:horizontalSpacing="15dp"-->
123 - android:verticalSpacing="5dp" 123 +<!-- android:verticalSpacing="5dp"-->
124 - android:overScrollMode="never" 124 +<!-- android:overScrollMode="never"-->
125 - android:visibility="visible" 125 +<!-- android:visibility="visible"-->
126 - android:layout_marginLeft="30dp" 126 +<!-- android:layout_marginLeft="30dp"-->
127 - android:layout_marginTop="5dp" 127 +<!-- android:layout_marginTop="5dp"-->
128 - app:layout_constraintLeft_toLeftOf="@+id/i_view_1" 128 +<!-- app:layout_constraintLeft_toLeftOf="@+id/i_view_1"-->
129 - app:layout_constraintTop_toBottomOf="@+id/i_view_1" />--> 129 +<!-- app:layout_constraintTop_toBottomOf="@+id/i_view_1" />-->
130 -
131 <com.sw.laryngoscope.widget.SlidingCheckLayout 130 <com.sw.laryngoscope.widget.SlidingCheckLayout
132 android:id="@+id/lay_sliding" 131 android:id="@+id/lay_sliding"
133 android:layout_width="1300dp" 132 android:layout_width="1300dp"
......
...@@ -11,7 +11,7 @@ android { ...@@ -11,7 +11,7 @@ android {
11 versionCode 21 11 versionCode 21
12 versionName "2.0.1" 12 versionName "2.0.1"
13 13
14 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 14 +// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
15 consumerProguardFiles 'consumer-rules.pro' 15 consumerProguardFiles 'consumer-rules.pro'
16 } 16 }
17 17
......
...@@ -13,3 +13,5 @@ ...@@ -13,3 +13,5 @@
13 #Mon May 13 10:51:52 CST 2024 13 #Mon May 13 10:51:52 CST 2024
14 android.enableJetifier=true 14 android.enableJetifier=true
15 android.useAndroidX=true 15 android.useAndroidX=true
16 +org.gradle.jvmargs=-Xmx4096m
17 +org.gradle.parallel=true
......