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

配置调整

Browse Source
master
hwf452 10 months ago
parent 6fb1d34e46
commit 97921218b4
10 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File

6
YFDXJ/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -327,12 +327,6 @@
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustPan" />
<service
android:name="com.bjzc.yfdxj.bleUtil.BluetoothLeService"
android:exported="false"
android:enabled="true" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileProvider"

2
YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java
Unescape Escape View File

@ -265,10 +265,12 @@ public class LoginActivity extends BaseActivity {
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse(lastLoginDate);
Calendar calendarOne = Calendar.getInstance();
if(date!=null){
calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) {
return true;
}
}
} catch (Exception e) {
e.printStackTrace();
}

36
YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java
Unescape Escape View File

@ -84,7 +84,7 @@ public class MainActivity extends BaseActivity3 {
//private int[] imageId = {R.mipmap.icon6, R.mipmap.icon11, R.mipmap.icon_dxj, R.mipmap.icon13};
//private int[] colors = {R.drawable.radius_e3, R.drawable.radius_a4, R.drawable.radius_a1, R.drawable.radius_b1};
private long exitTime = 0;
private BluetoothLeService mBluetoothLeService;
//private BluetoothLeService mBluetoothLeService;
public static final int REQUEST_CHECK_TEMPERATURE = 1;
public static final int REQUEST_CHECK_VIBRATION = 2;
private String userID;
@ -284,8 +284,8 @@ public class MainActivity extends BaseActivity3 {
colors.add(R.drawable.radius_c6);
setAdapter();
Intent gattServiceIntent = new Intent(this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
// Intent gattServiceIntent = new Intent(this, BluetoothLeService.class);
// bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
String username = (String) SPUtils.get(MainActivity.this, Contans.USERNAME, String.valueOf(""));
if (username != null) {
tvLoginUser.setText("登录用户：" + username);
@ -432,17 +432,17 @@ public class MainActivity extends BaseActivity3 {
return super.onKeyDown(keyCode, event);
}
private final ServiceConnection mServiceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName componentName, IBinder service) {
mBluetoothLeService = ((BluetoothLeService.LocalBinder) service).getService();
}
@Override
public void onServiceDisconnected(ComponentName componentName) {
mBluetoothLeService = null;
}
};
// private final ServiceConnection mServiceConnection = new ServiceConnection() {
// @Override
// public void onServiceConnected(ComponentName componentName, IBinder service) {
// mBluetoothLeService = ((BluetoothLeService.LocalBinder) service).getService();
// }
//
// @Override
// public void onServiceDisconnected(ComponentName componentName) {
// mBluetoothLeService = null;
// }
// };
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
@ -578,7 +578,6 @@ public class MainActivity extends BaseActivity3 {
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
@ -609,11 +608,6 @@ public class MainActivity extends BaseActivity3 {
@Override
public void onDestroy() {
if(mBluetoothLeService!=null){
mBluetoothLeService.disconnect();
mBluetoothLeService.close();
}
unbindService(mServiceConnection);
if(flashUtil!=null){
flashUtil.finishFlashUtils();
}
@ -624,8 +618,6 @@ public class MainActivity extends BaseActivity3 {
if(timer!=null){
timer.cancel();
}
Intent intent = new Intent(this, BluetoothLeService.class);
stopService(intent);
// 注销广播接收器
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);

7
YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzCheckActivity.java
Unescape Escape View File

@ -19,6 +19,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.yfdxj.DBModel.Dqgz;
import com.bjzc.yfdxj.R;
import com.bjzc.yfdxj.base.BaseActivity3;
import com.bjzc.yfdxj.bleUtil.BlueTestInfoActivity;
import com.bjzc.yfdxj.bleUtil.BluetoothLeService;
import com.bjzc.yfdxj.contans.Contans;
import com.bjzc.yfdxj.utils.SPUtils;
@ -106,7 +107,8 @@ public class DqgzCheckActivity extends BaseActivity3 {
}
});
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(DqgzCheckActivity.this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Bundle bundle = DqgzCheckActivity.this.getIntent().getExtras();
if (bundle != null) {
isEdit = bundle.getBoolean("edit");
@ -342,7 +344,8 @@ public class DqgzCheckActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
unregisterReceiver(mGattUpdateReceiver);
// 注销广播接收器
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}

7
YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbxdjcjsbActivity.java
Unescape Escape View File

@ -25,6 +25,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.yfdxj.DBModel.QYDDATABean;
import com.bjzc.yfdxj.R;
import com.bjzc.yfdxj.activity.regular.DqgzCheckActivity;
import com.bjzc.yfdxj.adapter.MyFragmentAdapter;
import com.bjzc.yfdxj.base.BaseActivity3;
import com.bjzc.yfdxj.bean.SetSbModel;
@ -137,7 +138,8 @@ public class SbxdjcjsbActivity extends BaseActivity3 {
}
});
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(SbxdjcjsbActivity.this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Bundle bundle = SbxdjcjsbActivity.this.getIntent().getExtras();
if (bundle != null) {
@ -284,7 +286,8 @@ public class SbxdjcjsbActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
unregisterReceiver(mGattUpdateReceiver);
// 注销广播接收器
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}
}

2
YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjMainActivity.java
Unescape Escape View File

@ -62,7 +62,7 @@ public class XjMainActivity extends BaseActivity3 {
Intent intent = new Intent(Contans.ACTION_PROFESSIONCHANGE);
intent.putExtra("professionId",profession.getZyid());
//专业选择改变发送广播,刷新任务下载页面
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);;
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
});

10
YFDXJ/app/src/main/java/com/bjzc/yfdxj/bleUtil/BlueTestInfoActivity.java
Unescape Escape View File

@ -29,6 +29,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.bjzc.yfdxj.R;
import com.bjzc.yfdxj.activity.regular.DqgzCheckActivity;
import com.bjzc.yfdxj.base.BaseActivity3;
import com.google.gson.Gson;
@ -37,6 +38,7 @@ import java.util.ArrayList;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class BlueTestInfoActivity extends BaseActivity3 {
@ -96,7 +98,7 @@ public class BlueTestInfoActivity extends BaseActivity3 {
return;
}
setAdapter();
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(BlueTestInfoActivity.this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Intent gattServiceIntent = new Intent(BlueTestInfoActivity.this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
initconn = true;
@ -245,7 +247,8 @@ public class BlueTestInfoActivity extends BaseActivity3 {
if (initconn) {
if (!mConnected) mBluetoothLeService.connect(mDeviceAddress);
} else {
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
//registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(BlueTestInfoActivity.this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Intent gattServiceIntent = new Intent(BlueTestInfoActivity.this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
initconn = true;
@ -400,7 +403,8 @@ public class BlueTestInfoActivity extends BaseActivity3 {
scanLeDevice(false);
mLeDeviceListAdapter.clear();
unbindService(mServiceConnection);
unregisterReceiver(mGattUpdateReceiver);
// 注销广播接收器
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}

2
YFDXJ/app/src/main/java/com/bjzc/yfdxj/bleUtil/BluetoothLeService.java
Unescape Escape View File

@ -103,7 +103,7 @@ public class BluetoothLeService extends Service {
private void broadcastUpdate(final String action) {
final Intent intent = new Intent(action);
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);;
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
}
//收到数据后，触发广播

3
YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/AutoToolbar.java
Unescape Escape View File

@ -7,13 +7,10 @@ import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.widget.TextView;
import com.bjzc.yfdxj.R;
import com.zhy.autolayout.AutoLayoutInfo;
import com.zhy.autolayout.utils.AutoLayoutHelper;
import com.zhy.autolayout.utils.AutoUtils;
import com.zhy.autolayout.utils.DimenUtils;
import java.lang.reflect.Field;
/**

3
YFDXJ/settings.gradle
Unescape Escape View File

@ -7,10 +7,8 @@ pluginManagement {
includeGroupByRegex("androidx.*")
}
}
//google()
mavenCentral()
gradlePluginPortal()
jcenter()
}
}
dependencyResolutionManagement {
@ -18,7 +16,6 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
jcenter()
maven {url "https://jitpack.io"}
//maven {url 'https://maven.google.com'}
}

Write Preview
Loading…
Cancel
Save