hwf453
/
BHDXJ_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.2 release

Browse Source
master
hwf452 9 months ago
parent 2dff722602
commit 74a5bc0005
8 changed files with 191 additions and 61 deletions
Show Stats Download Patch File Download Diff File

4
BHDXJ/app/build.gradle
Unescape Escape View File

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.bhdxj" applicationId "com.rehome.bhdxj"
minSdk 24 minSdk 24
targetSdk 35 targetSdk 35
versionCode 111 versionCode 112
versionName "1.1.1" versionName "1.1.2"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

2
BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/LoginActivity.kt
Unescape Escape View File

@ -356,7 +356,7 @@ class LoginActivity : BaseActivityAutoToolbarViewBinding<ActivityLoginBinding>()
val calendar = Calendar.getInstance() val calendar = Calendar.getInstance()
//增加7天，负数则为减少天数 //增加7天，负数则为减少天数
//calendar.add(Calendar.DATE, 1) //calendar.add(Calendar.DATE, 1)
calendar.add(Calendar.DATE, 7) calendar.add(Calendar.DATE, 2)
val nowStr = sdFormat.format(calendar.time) val nowStr = sdFormat.format(calendar.time)
SPUtils.put( SPUtils.put(
context, context,

45
BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/MainActivity.java
Unescape Escape View File

@ -13,7 +13,9 @@ import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Button;
import android.widget.GridView; import android.widget.GridView;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -40,6 +42,7 @@ import com.rehome.bhdxj.utils.NohttpUtils;
import com.rehome.bhdxj.utils.OAToolbar; import com.rehome.bhdxj.utils.OAToolbar;
import com.rehome.bhdxj.utils.SPUtils; import com.rehome.bhdxj.utils.SPUtils;
import com.rehome.bhdxj.utils.StatusBarUtil; import com.rehome.bhdxj.utils.StatusBarUtil;
import com.rehome.bhdxj.weight.AuditDialog;
import com.rehome.bhdxj.weight.toastviewbymyself; import com.rehome.bhdxj.weight.toastviewbymyself;
import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.RequestMethod;
@ -59,6 +62,9 @@ import java.util.TimerTask;
public class MainActivity extends BaseActivity3 { public class MainActivity extends BaseActivity3 {
Button btnLogout;
TextView tvLoginUser;
OAToolbar toolbar; OAToolbar toolbar;
GridView gv; GridView gv;
@ -84,12 +90,19 @@ public class MainActivity extends BaseActivity3 {
@Override @Override
public void initView() { public void initView() {
toolbar = findViewById(R.id.toolbar); toolbar = findViewById(R.id.toolbar);
btnLogout = findViewById(R.id.btn_logout);
tvLoginUser = findViewById(R.id.tv_login_user);
gv = findViewById(R.id.gv); gv = findViewById(R.id.gv);
toolbar.setBackgroundColor(Color.parseColor("#00000000")); toolbar.setBackgroundColor(Color.parseColor("#00000000"));
getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);//设置透明状态栏 getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);//设置透明状态栏
getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);//设置透明导航栏 getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);//设置透明导航栏
StatusBarUtil.transparencyBar(MainActivity.this);//设置透明状态栏 StatusBarUtil.transparencyBar(MainActivity.this);//设置透明状态栏
String username = (String) SPUtils.get(MainActivity.this, Contans.USERNAME, String.valueOf(""));
if (username != null) {
tvLoginUser.setText("登录用户：" + username);
}
if (NetworkUtil.canNetWorkConnect(context)) { if (NetworkUtil.canNetWorkConnect(context)) {
Log.i("app", "有网络"); Log.i("app", "有网络");
} else { } else {
@ -102,6 +115,38 @@ public class MainActivity extends BaseActivity3 {
if(NetworkUtil.canNetWorkConnect(context)&& NetworkUtil.isWifiNetWorkConnect(context)){ if(NetworkUtil.canNetWorkConnect(context)&& NetworkUtil.isWifiNetWorkConnect(context)){
Log.i("app", "wifi网络"); Log.i("app", "wifi网络");
} }
btnLogout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
AuditDialog auditDialog = new AuditDialog(context, "确定要退出登录吗？", new AuditDialog.AuditDialogListener() {
@Override
public void confirm() {
SPUtils.remove(MainActivity.this,"save");
//SPUtils.remove(MainActivity.this,Contans.USERID);
//SPUtils.remove(MainActivity.this,Contans.USERPWD);
SPUtils.remove(MainActivity.this,Contans.USERNAME);
SPUtils.remove(MainActivity.this,Contans.BZBH);
SPUtils.remove(MainActivity.this,Contans.BZMC);
SPUtils.remove(MainActivity.this,Contans.PERMISSIONSRESULT);
SPUtils.remove(MainActivity.this,Contans.NFCBM);
SPUtils.remove(MainActivity.this,Contans.LASTLOGINDATE);
//SPUtils.clear(MainActivity.this);
Intent intent = new Intent(MainActivity.this, LoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intent);
finish();
}
@Override
public void cancel() {
}
});
auditDialog.show();
}
});
} }
@Override @Override

98
BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt
Unescape Escape View File

@ -107,43 +107,59 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding<ActivityQxgdNewBinding>
binding.etQxms.setContentTextSize(54) binding.etQxms.setContentTextSize(54)
binding.ilJz.setOnClickListener(View.OnClickListener { v: View? -> binding.ilJz.setOnClickListener(View.OnClickListener { v: View? ->
val dialog = ListDialog( if(jzDialogDatas.size>0){
context, jzDialogDatas val dialog = ListDialog(
) { _: String?, position: Int -> context, jzDialogDatas
jzValue = jzList[position].value ) { _: String?, position: Int ->
binding.ilJz.content = jzList[position].description jzValue = jzList[position].value
binding.ilJz.content = jzList[position].description
}
dialog.show()
}else{
showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。")
} }
dialog.show()
}) })
binding.ilZy.setOnClickListener(View.OnClickListener { v: View? -> binding.ilZy.setOnClickListener(View.OnClickListener { v: View? ->
val dialog = ListDialog( if(zyDialogDatas.size>0){
context, zyDialogDatas val dialog = ListDialog(
) { _: String?, position: Int -> context, zyDialogDatas
zyValue = zyList[position].value ) { _: String?, position: Int ->
binding.ilZy.content = zyList[position].description zyValue = zyList[position].value
binding.ilZy.content = zyList[position].description
}
dialog.show()
}else{
showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。")
} }
dialog.show()
}) })
binding.ilQxlx.setOnClickListener(View.OnClickListener { v: View? -> binding.ilQxlx.setOnClickListener(View.OnClickListener { v: View? ->
val dialog = ListDialog( if(gzlxDialogDatas.size>0){
context, gzlxDialogDatas val dialog = ListDialog(
) { _: String?, position: Int -> context, gzlxDialogDatas
lxvalue = gzlxList[position].value ) { _: String?, position: Int ->
binding.ilQxlx.content = gzlxList[position].description lxvalue = gzlxList[position].value
binding.ilQxlx.content = gzlxList[position].description
}
dialog.show()
}else{
showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。")
} }
dialog.show()
}) })
binding.ilQxdj.setOnClickListener(View.OnClickListener { v: View? -> binding.ilQxdj.setOnClickListener(View.OnClickListener { v: View? ->
val dialog = ListDialog( if(gdjbDialogDatas.size>0){
context, gdjbDialogDatas val dialog = ListDialog(
) { _: String?, position: Int -> context, gdjbDialogDatas
qxdjValue = gdjbList[position].value ) { _: String?, position: Int ->
binding.ilQxdj.content = gdjbList[position].description qxdjValue = gdjbList[position].value
binding.ilQxdj.content = gdjbList[position].description
}
dialog.show()
}else{
showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。")
} }
dialog.show()
}) })
binding.ilWz.setOnClickListener(View.OnClickListener { binding.ilWz.setOnClickListener(View.OnClickListener {
@ -158,24 +174,32 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding<ActivityQxgdNewBinding>
}) })
binding.ilGzlb.setOnClickListener(View.OnClickListener { v: View? -> binding.ilGzlb.setOnClickListener(View.OnClickListener { v: View? ->
val dialog = ListDialog( if(gzlbDialogDatas.size>0){
context, gzlbDialogDatas val dialog = ListDialog(
) { _: String?, position: Int -> context, gzlbDialogDatas
gzlbValue = gzlbList[position].value ) { _: String?, position: Int ->
binding.ilGzlb.content = gzlbList[position].description gzlbValue = gzlbList[position].value
checkConnectServerGzxx() binding.ilGzlb.content = gzlbList[position].description
checkConnectServerGzxx()
}
dialog.show()
}else{
showToast("下拉数据获取失败，请先选择位置。")
} }
dialog.show()
}) })
binding.ilGzxx.setOnClickListener(View.OnClickListener { v: View? -> binding.ilGzxx.setOnClickListener(View.OnClickListener { v: View? ->
val dialog = ListDialog( if(gzxxDialogDatas.size>0){
context, gzxxDialogDatas val dialog = ListDialog(
) { _: String?, position: Int -> context, gzxxDialogDatas
gzxxValue = gzxxList[position].value ) { _: String?, position: Int ->
binding.ilGzxx.content = gzxxList[position].description gzxxValue = gzxxList[position].value
binding.ilGzxx.content = gzxxList[position].description
}
dialog.show()
}else{
showToast("下拉数据获取失败，请先选择故障类别。")
} }
dialog.show()
}) })
} }

13
BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java
Unescape Escape View File

@ -5,11 +5,14 @@ public class Contans {
public static String LOGIN = "AppLogin/GetData.aspx"; public static String LOGIN = "AppLogin/GetData.aspx";
public static String CHECK_UPDATA_APK = "ApkUpdate/GetData.aspx"; public static String CHECK_UPDATA_APK = "ApkUpdate/GetData.aspx";
// public static String IP = "http://10.46.0.164:8002/"; // public static String IP = "http://10.46.0.164:8002/";
// public static String MAXIMOIP = "http://10.46.0.15:7001/"; // public static String MAXIMOIP = "http://10.46.0.15:7001/";
//测试IP
public static String IP = "http://10.46.0.164:8003/"; // public static String IP = "http://10.46.0.164:8003/";
public static String MAXIMOIP = "http://10.46.0.164:8003/"; // public static String MAXIMOIP = "http://10.46.0.164:8003/";
//正式接口IP
public static String IP = "http://10.46.0.164:8002/";
public static String MAXIMOIP = "http://10.46.0.164:8002/";
// public static String MAXIMOIP = "http://10.46.0.152:7001/"; // public static String MAXIMOIP = "http://10.46.0.152:7001/";
@ -27,7 +30,7 @@ public class Contans {
//缺陷工单专业下拉 //缺陷工单专业下拉
public static String QX_GET_ZY_DROP = "QXGD/QXGD_JCSJ.ashx"; public static String QX_GET_ZY_DROP = "QXGD/QXGD_JCSJ.ashx";
//缺陷工单提交 //缺陷工单提交
public static String QX_SUBMIT_URL= "QXGD/QXGD_WORKORDER.ashx"; public static String QX_SUBMIT_URL = "QXGD/QXGD_WORKORDER.ashx";
//连接服务器测试，看客户端是否能连接到服务器，如果能就响应个1 //连接服务器测试，看客户端是否能连接到服务器，如果能就响应个1
public static final String check_server_connect = "WL/WLPD.ashx"; public static final String check_server_connect = "WL/WLPD.ashx";

21
BHDXJ/app/src/main/res/drawable/presslogout.xml
Unescape Escape View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape>
<solid android:color="#AA603C"/>
<corners android:radius="8px"/>
<stroke android:width="0px"
android:color="#033879"/>
<padding android:bottom="1dip"/>
</shape>
</item>
<item android:state_pressed="true">
<shape>
<solid android:color="#138CD2"/>
<corners android:radius="8px"/>
<stroke android:width="0px"
android:color="#033879"/>
<padding android:bottom="1dip"/>
</shape>
</item>
</selector>

63
BHDXJ/app/src/main/res/layout/activity_main.xml
Unescape Escape View File

@ -11,23 +11,54 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:visibility="gone" android:layout_height="wrap_content"
android:layout_height="wrap_content"> android:visibility="gone">
<include layout="@layout/layout_base" />
<include layout="@layout/layout_base" />
</RelativeLayout> </RelativeLayout>
<GridView <FrameLayout
android:layout_gravity="center" android:layout_width="match_parent"
android:gravity="center" android:layout_height="match_parent">
android:id="@+id/gv"
android:layout_width="fill_parent" <GridView
android:layout_height="wrap_content" android:id="@+id/gv"
android:layout_margin="@dimen/gridview_interval" android:layout_width="match_parent"
android:horizontalSpacing="@dimen/gridview_interval" android:layout_height="match_parent"
android:listSelector="@null" android:layout_gravity="center"
android:numColumns="2" android:layout_margin="@dimen/gridview_interval"
android:scrollbars="none" android:horizontalSpacing="@dimen/gridview_interval"
android:stretchMode="columnWidth" android:listSelector="@null"
android:verticalSpacing="@dimen/gridview_interval" /> android:numColumns="2"
android:scrollbars="none"
android:stretchMode="columnWidth"
android:verticalSpacing="@dimen/gridview_interval" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_gravity="bottom">
<TextView
android:id="@+id/tv_login_user"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="8dp"
android:textColor="#333333"
android:textSize="18sp" />
<Button
android:id="@+id/btn_logout"
style="@style/button_logout"
android:layout_width="80dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:text="退出登录"
android:textSize="14sp" />
</RelativeLayout>
</FrameLayout>
</LinearLayout> </LinearLayout>

6
BHDXJ/app/src/main/res/values/styles.xml
Unescape Escape View File

@ -129,5 +129,11 @@
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:textColor">@color/black</item> <item name="android:textColor">@color/black</item>
</style> </style>
<style name="button_logout">
<item name="android:layout_marginLeft">10px</item>
<item name="android:background">@drawable/presslogout</item>
<item name="android:textColor">#ffffff</item>
<item name="android:layout_gravity">center</item>
</style>
</resources> </resources>

Write Preview
Loading…
Cancel
Save