liufuhua007

修改重构的bug

......@@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId "com.sw.laryngoscope"
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 30
versionCode vcode
versionName "V" + version + "_" + getVersionName()
......@@ -61,8 +61,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
//自动生成指定名称的release发布版的 apk文件
......@@ -114,7 +114,7 @@ dependencies {
//noinspection GradleCompatible
implementation 'com.android.support:recyclerview-v7:23.4.0'
implementation files('libs/org.litepal.guolin_3.2.3.jar')
// implementation files('libs/org.litepal.guolin_3.2.3.jar')
implementation 'com.google.code.gson:gson:2.8.5'
......@@ -138,14 +138,14 @@ dependencies {
// implementation files('libs\\signature-pad.jar')
// implementation 'com.github.gcacace:signature-pad:1.3.1' // 或最新版本
implementation 'com.github.mhiew:android-pdf-viewer:3.2.0-beta.1'
implementation files('libs\\dcm4che-core-5.27.0.jar')
implementation files('libs\\dcm4che-net-5.27.0.jar')
// implementation files('libs\\dcm4che-core-5.27.0.jar')
// implementation files('libs\\dcm4che-net-5.27.0.jar')
implementation project(":ffmpeg")
implementation files('libs\\wifilibrary.jar')
// implementation files('libs\\wifilibrary.jar')
compileOnly files('syslibs/framework.jar')
// implementation("com.google.android.fhir:engine:1.0.0")
}
......
......@@ -300,7 +300,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo
break;
}
binding.layoutUserList.getRoot().setVisibility(View.GONE);
binding.layoutUserList.getRoot().setVisibility(View.VISIBLE);
binding.layoutUserSwtich.getRoot().setVisibility(View.VISIBLE);
binding.layoutUserSwtich.edSwitchName.setText(curSelAcc.getName());
binding.layoutUserSwtich.edSwitchName.setEnabled(false);
binding.layoutUserSwtich.edSwitchPsd.setText("");
......@@ -326,7 +326,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo
curSelAcc.setIsSelect(1);
curSelAcc.saveOrUpdate("name = ?", curSelAcc.getName());
AccountManager.getInstance().findAll();
MyApplication.showToastShort(getString(R.string.string_login_success));
// MyApplication.showToastShort(getString(R.string.string_login_success));
homeActivity.setUseName();
homeActivity.showSettingIcon();
binding.layBack.performClick();
......@@ -384,7 +384,7 @@ public class LoginFragment extends BaseFragment<FgLoginBinding> implements Custo
binding.layoutUserList.getRoot().setVisibility(View.VISIBLE);
binding.layoutUserNew.getRoot().setVisibility(View.GONE);
binding.layoutUserEdit.getRoot().setVisibility(View.GONE);
binding.layoutUserList.getRoot().setVisibility(View.GONE);
binding.layoutUserSwtich.getRoot().setVisibility(View.GONE);
}
private void hideInput(View view) {
......
......@@ -58,7 +58,8 @@ import java.util.Iterator;
import java.util.List;
public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> implements CustomTimer.TimerCallBack, DetailGdItemAdapter.OnClickLitener,
public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> implements
CustomTimer.TimerCallBack, DetailGdItemAdapter.OnClickLitener,
RadioGroup.OnCheckedChangeListener, StorageStateManager.MountCallBack,
DetailCopyInfoPopWindow.copyCallback, SlidingCheckLayout.OnSlidingPositionListener, View.OnClickListener {
......@@ -118,6 +119,7 @@ public class ArcDetailFragment extends BaseFragment<FgArchiveDetailBinding> impl
binding.txtVideoNum.setVisibility(View.VISIBLE);
binding.txtVideoNumValue.setVisibility(View.VISIBLE);
}
mDetailGdItemAdapter.notifyDataSetChanged();
}
public void setMountCallBack() {
......
......@@ -189,11 +189,11 @@ public class ArchiveFragment extends BaseFragment<FgArchiveBinding> implements C
if ( userDb.getUserType() == InitParam.USER_TYPE_ADMIN ) {
mFileListMg.curFoldLevel = InitParam.FOLDER_LEVEL.L_ONE.ordinal();
mFileListMg.initList();
binding.layoutArchiveFile.btnTimeSel.setVisibility(View.GONE);
binding.layoutArchiveFile.layoutTimeSel.setVisibility(View.GONE);
binding.layoutArchiveFile.txtSearch.setVisibility(View.GONE);
} else {
selTwoFold(userDb.getName());
binding.layoutArchiveFile.btnTimeSel.setVisibility(View.VISIBLE);
binding.layoutArchiveFile.layoutTimeSel.setVisibility(View.VISIBLE);
binding.layoutArchiveFile.txtSearch.setVisibility(View.VISIBLE);
}
}
......
......@@ -27,17 +27,14 @@ import java.util.List;
public class DetailGdItemAdapter extends RecyclerView.Adapter<DetailGdItemAdapter.ViewHolder> {
private Context context;
private List<RecordInfoDB> list;
public List<Boolean> checkList = new ArrayList<>();
private LayoutInflater mInflater;
private OnClickLitener listener;
private ViewHolder viewHolder;
private View view;
@SuppressLint("NotifyDataSetChanged")
public void setList(List<RecordInfoDB> list) {
this.list = list;
checkList.clear();
......@@ -58,6 +55,7 @@ public class DetailGdItemAdapter extends RecyclerView.Adapter<DetailGdItemAdapte
}
}
@SuppressLint("NotifyDataSetChanged")
public void setsingleCheck(int position) {
checkList.set(list.size() - position - 1, !checkList.get(list.size() - position - 1));
notifyDataSetChanged();
......
......@@ -114,20 +114,19 @@
app:layout_constraintTop_toBottomOf="@+id/i_view_1" />
<!--<androidx.recyclerview.widget.RecyclerView
android:id="@+id/gd_detail"
android:layout_width="1021dp"
android:layout_height="850dp"
android:numColumns="3"
android:horizontalSpacing="15dp"
android:verticalSpacing="5dp"
android:overScrollMode="never"
android:visibility="visible"
android:layout_marginLeft="30dp"
android:layout_marginTop="5dp"
app:layout_constraintLeft_toLeftOf="@+id/i_view_1"
app:layout_constraintTop_toBottomOf="@+id/i_view_1" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/gd_detail"-->
<!-- android:layout_width="1021dp"-->
<!-- android:layout_height="850dp"-->
<!-- android:numColumns="3"-->
<!-- android:horizontalSpacing="15dp"-->
<!-- android:verticalSpacing="5dp"-->
<!-- android:overScrollMode="never"-->
<!-- android:visibility="visible"-->
<!-- android:layout_marginLeft="30dp"-->
<!-- android:layout_marginTop="5dp"-->
<!-- app:layout_constraintLeft_toLeftOf="@+id/i_view_1"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/i_view_1" />-->
<com.sw.laryngoscope.widget.SlidingCheckLayout
android:id="@+id/lay_sliding"
android:layout_width="1300dp"
......
......@@ -11,7 +11,7 @@ android {
versionCode 21
versionName "2.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
}
......
......@@ -13,3 +13,5 @@
#Mon May 13 10:51:52 CST 2024
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx4096m
org.gradle.parallel=true
......