@@ -16,3 +16,4 @@ | |||||
/.idea/migrations.xml | /.idea/migrations.xml | ||||
/app/release/output-metadata.json | /app/release/output-metadata.json | ||||
/app/src/main/res/mipmap-xxxhdpi/yxz.png | /app/src/main/res/mipmap-xxxhdpi/yxz.png | ||||
app/release/boluo-peiliaobatai-v17-202410311049-unsigned-release.apk |
@@ -172,7 +172,7 @@ dependencies { | |||||
// implementation files('libs\\org.eclipse.paho.client.mqttv3-1.2.5.jar') | // implementation files('libs\\org.eclipse.paho.client.mqttv3-1.2.5.jar') | ||||
//基类 | //基类 | ||||
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4' | |||||
// implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4' | |||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' | coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' | ||||
implementation 'com.contrarywind:Android-PickerView:3.2.6' | implementation 'com.contrarywind:Android-PickerView:3.2.6' | ||||
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; | |||||
import com.bonait.bnframework.R; | import com.bonait.bnframework.R; | ||||
import com.chad.library.adapter.base.BaseQuickAdapter; | import com.chad.library.adapter.base.BaseQuickAdapter; | ||||
import com.chad.library.adapter.base.viewholder.BaseViewHolder; | |||||
import com.chad.library.adapter.base.BaseViewHolder; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -11,7 +11,7 @@ import com.bonait.bnframework.R; | |||||
import com.bonait.bnframework.common.view.MyLayoutManager; | import com.bonait.bnframework.common.view.MyLayoutManager; | ||||
import com.bonait.bnframework.modules.home.adapter.liaochang_adapter; | import com.bonait.bnframework.modules.home.adapter.liaochang_adapter; | ||||
import com.chad.library.adapter.base.BaseQuickAdapter; | import com.chad.library.adapter.base.BaseQuickAdapter; | ||||
import com.chad.library.adapter.base.viewholder.BaseViewHolder; | |||||
import com.chad.library.adapter.base.BaseViewHolder; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -32,7 +32,7 @@ public class RightAdapter extends BaseQuickAdapter<LinkMode, BaseViewHolder> { | |||||
MyLayoutManager layout = new MyLayoutManager(); | MyLayoutManager layout = new MyLayoutManager(); | ||||
layout.setAutoMeasureEnabled(true); | layout.setAutoMeasureEnabled(true); | ||||
view.setLayoutManager(layout); | view.setLayoutManager(layout); | ||||
liaochang_adapter adapter = new liaochang_adapter(getContext(), item.content); | |||||
liaochang_adapter adapter = new liaochang_adapter(view.getContext(), item.content); | |||||
view.setAdapter(adapter); | view.setAdapter(adapter); | ||||
//holder.setText(R.id.RecyclerView,item.content.get(0)); | //holder.setText(R.id.RecyclerView,item.content.get(0)); | ||||
@@ -18,7 +18,7 @@ import com.bonait.bnframework.common.linktab.LinkMode; | |||||
import com.bonait.bnframework.common.utils.AlertDialogUtils; | import com.bonait.bnframework.common.utils.AlertDialogUtils; | ||||
import com.bonait.bnframework.common.utils.ToastUtils; | import com.bonait.bnframework.common.utils.ToastUtils; | ||||
import com.chad.library.adapter.base.BaseQuickAdapter; | import com.chad.library.adapter.base.BaseQuickAdapter; | ||||
import com.chad.library.adapter.base.viewholder.BaseViewHolder; | |||||
import com.chad.library.adapter.base.BaseViewHolder; | |||||
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; | import com.qmuiteam.qmui.widget.dialog.QMUIDialog; | ||||
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; | import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; | ||||
@@ -74,7 +74,7 @@ public class GoodLeftAdapter extends BaseQuickAdapter<LinkMode, BaseViewHolder> | |||||
@Override | @Override | ||||
public void onClick(View view) { | public void onClick(View view) { | ||||
final QMUIDialog.EditTextDialogBuilder builder_add = | final QMUIDialog.EditTextDialogBuilder builder_add = | ||||
new QMUIDialog.EditTextDialogBuilder(getContext()); | |||||
new QMUIDialog.EditTextDialogBuilder(holder.getView(R.id.tv_update).getContext()); | |||||
builder_add.setTitle("修改类型") | builder_add.setTitle("修改类型") | ||||
.setPlaceholder("请输入") | .setPlaceholder("请输入") | ||||
.setInputType(InputType.TYPE_CLASS_TEXT) | .setInputType(InputType.TYPE_CLASS_TEXT) | ||||
@@ -112,7 +112,7 @@ public class GoodLeftAdapter extends BaseQuickAdapter<LinkMode, BaseViewHolder> | |||||
holder.getView(R.id.tv_delete).setOnClickListener(new View.OnClickListener() { | holder.getView(R.id.tv_delete).setOnClickListener(new View.OnClickListener() { | ||||
@Override | @Override | ||||
public void onClick(View view) { | public void onClick(View view) { | ||||
AlertDialogUtils.showDialog(getContext(), | |||||
AlertDialogUtils.showDialog(holder.getView(R.id.tv_update).getContext(), | |||||
"删除提示!", | "删除提示!", | ||||
"客官确定要删除类型,[" +type.name+ "]吗?", | "客官确定要删除类型,[" +type.name+ "]吗?", | ||||
new QMUIDialogAction.ActionListener() { | new QMUIDialogAction.ActionListener() { | ||||
@@ -19,7 +19,6 @@ import com.bonait.bnframework.modules.home.adapter.AttributeSetAdapter; | |||||
import com.bonait.bnframework.modules.home.adapter.liaochang_adapter; | import com.bonait.bnframework.modules.home.adapter.liaochang_adapter; | ||||
import com.bonait.bnframework.modules.home.adapter.newgood_adapter; | import com.bonait.bnframework.modules.home.adapter.newgood_adapter; | ||||
import com.chad.library.adapter.base.BaseQuickAdapter; | import com.chad.library.adapter.base.BaseQuickAdapter; | ||||
import com.chad.library.adapter.base.viewholder.BaseViewHolder; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -15,7 +15,7 @@ import com.bonait.bnframework.common.linktab.LinkMode; | |||||
import com.bonait.bnframework.common.utils.AlertDialogUtils; | import com.bonait.bnframework.common.utils.AlertDialogUtils; | ||||
import com.bonait.bnframework.common.utils.ToastUtils; | import com.bonait.bnframework.common.utils.ToastUtils; | ||||
import com.chad.library.adapter.base.BaseQuickAdapter; | import com.chad.library.adapter.base.BaseQuickAdapter; | ||||
import com.chad.library.adapter.base.viewholder.BaseViewHolder; | |||||
import com.chad.library.adapter.base.BaseViewHolder; | |||||
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; | import com.qmuiteam.qmui.widget.dialog.QMUIDialog; | ||||
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; | import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; | ||||
@@ -13,7 +13,7 @@ import com.bonait.bnframework.common.view.MyLayoutManager; | |||||
import com.bonait.bnframework.modules.home.adapter.newgood_adapter; | import com.bonait.bnframework.modules.home.adapter.newgood_adapter; | ||||
import com.bonait.bnframework.modules.home.adapter.newmakegood_adapter; | import com.bonait.bnframework.modules.home.adapter.newmakegood_adapter; | ||||
import com.chad.library.adapter.base.BaseQuickAdapter; | import com.chad.library.adapter.base.BaseQuickAdapter; | ||||
import com.chad.library.adapter.base.viewholder.BaseViewHolder; | |||||
import com.chad.library.adapter.base.BaseViewHolder; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -34,7 +34,7 @@ public class MakeGoodRightAdapter extends BaseQuickAdapter<LinkMode, BaseViewHol | |||||
MyLayoutManager layout = new MyLayoutManager(); | MyLayoutManager layout = new MyLayoutManager(); | ||||
layout.setAutoMeasureEnabled(true); | layout.setAutoMeasureEnabled(true); | ||||
view.setLayoutManager(layout); | view.setLayoutManager(layout); | ||||
adapter = new newmakegood_adapter(getContext(), item.content); | |||||
adapter = new newmakegood_adapter(view.getContext(), item.content); | |||||
view.setAdapter(adapter); | view.setAdapter(adapter); | ||||
} | } | ||||
} | } |
@@ -120,32 +120,37 @@ public class SystemParameterActivity extends BaseActivity { | |||||
bpa_systemsets = QueryDB.GetSystemsetALL(); | bpa_systemsets = QueryDB.GetSystemsetALL(); | ||||
for (BPA_SYSTEMSET item : bpa_systemsets) { | for (BPA_SYSTEMSET item : bpa_systemsets) { | ||||
switch (item.type) { | |||||
case -100: | |||||
ConfigName.getInstance().versionSelectionEnum = item.value; | |||||
versionselection.setSelection(material_map_vis.get(item.value)); | |||||
break; | |||||
case -99: | |||||
ConfigName.getInstance().Environment = item.value; | |||||
environment.setSelection(material_map.get(item.value)); | |||||
break; | |||||
case 1: | |||||
ConfigName.getInstance().Address = item.value; | |||||
edittext1.setText(item.value); | |||||
break; | |||||
case 2: | |||||
ConfigName.getInstance().Post = Integer.parseInt(item.value); | |||||
edittext2.setText(item.value); | |||||
break; | |||||
case 3: | |||||
ConfigName.getInstance().ClientAutoKey = item.value; | |||||
edittext3.setText(item.value); | |||||
break; | |||||
case 4: | |||||
ConfigName.getInstance().DeviceAutoKey = item.value; | |||||
edittext4.setText(item.value); | |||||
break; | |||||
try{ | |||||
switch (item.type) { | |||||
case -100: | |||||
ConfigName.getInstance().versionSelectionEnum = item.value; | |||||
versionselection.setSelection(material_map_vis.get(item.value)); | |||||
break; | |||||
case -99: | |||||
ConfigName.getInstance().Environment = item.value; | |||||
environment.setSelection(material_map.get(item.value)); | |||||
break; | |||||
case 1: | |||||
ConfigName.getInstance().Address = item.value; | |||||
edittext1.setText(item.value); | |||||
break; | |||||
case 2: | |||||
ConfigName.getInstance().Post = Integer.parseInt(item.value); | |||||
edittext2.setText(item.value); | |||||
break; | |||||
case 3: | |||||
ConfigName.getInstance().ClientAutoKey = item.value; | |||||
edittext3.setText(item.value); | |||||
break; | |||||
case 4: | |||||
ConfigName.getInstance().DeviceAutoKey = item.value; | |||||
edittext4.setText(item.value); | |||||
break; | |||||
} | |||||
}catch (Exception e){ | |||||
e.printStackTrace(); | |||||
} | } | ||||
} | } | ||||
} | } | ||||