1.0

app/src/main/AndroidManifest.xml

@@ -107,12 +107,12 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter>
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/device_filter" />
+<!--            <intent-filter>-->
+<!--                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />-->
+<!--            </intent-filter>-->
+<!--            <meta-data-->
+<!--                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"-->
+<!--                android:resource="@xml/device_filter" />-->
         </activity>
 
 

app/src/main/java/com/siwei/recyclebox/application/AppApplication.java

@@ -49,7 +49,7 @@ import com.siwei.recyclebox.deviceUtils.SerialPortUtil;
 import com.siwei.recyclebox.ui.main.MainActivity;
 import com.siwei.recyclebox.R;
 import com.siwei.recyclebox.ui.main.MainViewModel;
-import com.squareup.leakcanary.LeakCanary;
+//import com.squareup.leakcanary.LeakCanary;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -87,9 +87,9 @@ public class AppApplication extends BaseApplication implements CustomActivityOnC
         //初始化全局异常崩溃
         initCrash();
         //内存泄漏检测
-        if (!LeakCanary.isInAnalyzerProcess(this)) {
-            LeakCanary.install(this);
-        }
+//        if (!LeakCanary.isInAnalyzerProcess(this)) {
+//            LeakCanary.install(this);
+//        }
 //        initAliIoT();
         initIoTDynamic();
 
@@ -107,7 +107,7 @@ public class AppApplication extends BaseApplication implements CustomActivityOnC
 //        DeviceInfo deviceInfo = new DeviceInfo();
 //        deviceInfo.productKey = "a13H8L6bDyf";// 产品类型
 //        deviceInfo.deviceName = "9pD3trz6OaDV8GF7yRsb";// 设备名称
-////        deviceInfo.deviceSecret = "lzR12lxbbuV3c4tZMxrIPl1Vh9K9Ssv4";// 设备密钥
+//        deviceInfo.deviceSecret = "a3NRdNGf7W5uYmW4mNG7tupSq9skwm0j";// 设备密钥
 //        deviceInfo.deviceSecret = SPUtils.getInstance().getString("deviceSecret");
         /**
          * 设置设备当前的初始状态值，属性需要和云端创建的物模型属性一致
@@ -178,7 +178,7 @@ public class AppApplication extends BaseApplication implements CustomActivityOnC
         Log.i("IMEI=",MainViewModel.getDeviceId(this));
         SPUtils.getInstance().put("IMEI",MainViewModel.getDeviceId(this));
 //        myDeviceInfo.deviceName="123456";
-//        SPUtils.getInstance().put("deviceSecret2","a3NRdNGf7W5uYmW4mNG7tupSq9skwm0j");//存
+//        SPUtils.getInstance().put("deviceSecret2","4pJyg1tm8VMOXZGwASAaaVgzRzZVMbbs");//存
         String secret = SPUtils.getInstance().getString("deviceSecret2");//读
 //        String secret ="";
         Log.i(TAG,"secret=="+secret);

app/src/main/java/com/siwei/recyclebox/ui/main/MainActivity.java

@@ -36,7 +36,7 @@ public class MainActivity extends BaseActivity<ViewDataBinding,MainViewModel> {
 //        viewModel.btnText.set("");
         openBlueTooth();
         viewModel.registerAliIoTListener();
-        viewModel.startJobScheduler();
+//        viewModel.startJobScheduler();
 //        viewModel.repeatTask();
         Log.i("repeatTask","*****************************************");
         viewModel.startBLEServer();

app/src/main/java/com/siwei/recyclebox/ui/main/MainViewModel.java

@@ -105,10 +105,10 @@ import top.maybesix.xhlibrary.serialport.ComPortData;
 import top.maybesix.xhlibrary.serialport.SerialPortHelper;
 import top.maybesix.xhlibrary.util.HexStringUtils;
 
-import com.siwei.recyclebox.entity.MapLocationInfo;
+//import com.siwei.recyclebox.entity.MapLocationInfo;
 import com.siwei.recyclebox.service.MyService;
 import com.siwei.recyclebox.utils.DemoOne;
-import com.siwei.recyclebox.utils.LocationUtils;
+//import com.siwei.recyclebox.utils.LocationUtils;
 import com.siwei.recyclebox.utils.SilentInstall;
 import com.siwei.recyclebox.utils.unZipFileDemo;
 import com.zhy.http.okhttp.OkHttpUtils;
@@ -124,9 +124,9 @@ public class MainViewModel extends BaseViewModel implements SerialPortHelper.OnS
     private TimerTask task1;
     private TimerTask task2;
     private TimerTask task3;
-    private LocationUtils mLocationUtils;
+//    private LocationUtils mLocationUtils;
     /** 定位信息 */
-    private MapLocationInfo mMapLocationInfo;
+//    private MapLocationInfo mMapLocationInfo;
     @RequiresApi(api = Build.VERSION_CODES.O)
     public void onCreate(){
         super.onCreate();
@@ -324,7 +324,7 @@ public class MainViewModel extends BaseViewModel implements SerialPortHelper.OnS
             int hour=readTime();
             Log.i("当前时间hour是：",hour+"dian");
 //            getDeviceProperty("1");
-            Log.i(TAG,"纬度"+mMapLocationInfo.getLatitude()+"经度"+mMapLocationInfo.getLongitude());
+//            Log.i(TAG,"纬度"+mMapLocationInfo.getLatitude()+"经度"+mMapLocationInfo.getLongitude());
         }
     };
     public View.OnClickListener btnClickreadWeight = new View.OnClickListener() {
@@ -1130,14 +1130,14 @@ public class MainViewModel extends BaseViewModel implements SerialPortHelper.OnS
                 Integer networkNum=netWorkInfo();
                 if(networkNum!=0) {
                     try {
-                        double longitude = 107.31;
-                        double latitude = 23.16;
-                        if (mMapLocationInfo != null) {
-                            longitude = mMapLocationInfo.getLongitude();
-                            latitude = mMapLocationInfo.getLatitude();
-                            Log.i(TAG, mMapLocationInfo.toString() + "--地址：" + mMapLocationInfo.getAddress());
-
-                        }
+                        double longitude = 104.05;
+                        double latitude = 30.69;
+//                        if (mMapLocationInfo != null) {
+//                            longitude = mMapLocationInfo.getLongitude();
+//                            latitude = mMapLocationInfo.getLatitude();
+//                            Log.i(TAG, mMapLocationInfo.toString() + "--地址：" + mMapLocationInfo.getAddress());
+//
+//                        }
                         Integer weight = 0;
                         Log.i("num=1", "读一次称重");
                         weight = SerialPortUtil.getInstance().getWeightDevice().readWeight();//读称重
@@ -2114,6 +2114,10 @@ public class MainViewModel extends BaseViewModel implements SerialPortHelper.OnS
             public void run() {
                 publish();
                 openLight();
+//                Integer networkInt=netWorkInfo();
+//                if(networkInt==0) {
+//                    restartApp();
+//                }
             }
         };
         timer.schedule(task1,600000,1800000);
@@ -2171,7 +2175,8 @@ public class MainViewModel extends BaseViewModel implements SerialPortHelper.OnS
             Log.i("day","关灯");
             SerialPortUtil.getInstance().getOtherDevice().closeLight1();
             if(readTime()==3){
-                restartAndroid();
+                restartApp();
+//                restartAndroid();
             }
         }
     }
@@ -2187,14 +2192,14 @@ public class MainViewModel extends BaseViewModel implements SerialPortHelper.OnS
         }
 
     }
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public void startJobScheduler() {
-        int jobId = 1;
-        @SuppressLint("JobSchedulerService") JobInfo.Builder jobInfo = new JobInfo.Builder(jobId, new ComponentName(getApplication(), MyService.class));
-        jobInfo.setPeriodic(10000);
-        jobInfo.setPersisted(true);
-        JobScheduler jobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
-        jobScheduler.schedule(jobInfo.build());
-    }
+//    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+//    public void startJobScheduler() {
+//        int jobId = 1;
+//        @SuppressLint("JobSchedulerService") JobInfo.Builder jobInfo = new JobInfo.Builder(jobId, new ComponentName(getApplication(), MyService.class));
+//        jobInfo.setPeriodic(10000);
+//        jobInfo.setPersisted(true);
+//        JobScheduler jobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
+//        jobScheduler.schedule(jobInfo.build());
+//    }
 
 }

app/src/main/res/layout/activity_main.xml

@@ -75,7 +75,7 @@
                     android:layout_width="120dp"
                     android:layout_height="96dp"
                     android:onClick="@{viewModal.btnClickReport}"
-                    android:text="数据上报4.0"
+                    android:text="数据上报1.0"
                     android:textSize="24sp" />
                 </LinearLayout>
                 <LinearLayout

config.gradle

@@ -6,10 +6,9 @@ ext {
             applicationId    : "com.goldze.mvvmhabit",
             minSdkVersion    : 21,
             targetSdkVersion : 25,
-            versionCode      : 4,
-            versionName      : "4.0",
-//            versionCode      : 1,
-//            versionName      : "1.0",
+
+            versionCode      : 1,
+            versionName      : "1.0",
     ]
     //version配置
     versions = [