瀏覽代碼

创建项目

pangweixin 5 年之前
父節點
當前提交
b3d5fb413d
共有 70 個文件被更改,包括 156 次插入152 次删除
  1. 1 0
      .idea/.name
  2. 2 0
      .idea/misc.xml
  3. 1 1
      app/build.gradle
  4. 1 1
      app/src/main/AndroidManifest.xml
  5. 4 4
      app/src/main/java/com/qingdaofushan/home/activity/CamActivity.java
  6. 4 4
      app/src/main/java/com/qingdaofushan/home/activity/LiveActivity.java
  7. 20 19
      app/src/main/java/com/qingdaofushan/home/activity/MainActivity.java
  8. 1 1
      app/src/main/java/com/qingdaofushan/home/bean/AppUpDataItem.java
  9. 1 1
      app/src/main/java/com/qingdaofushan/home/bean/ExpandsBean.java
  10. 1 1
      app/src/main/java/com/qingdaofushan/home/bean/FetchUpBean.java
  11. 1 1
      app/src/main/java/com/qingdaofushan/home/bean/ItemCommon.java
  12. 1 1
      app/src/main/java/com/qingdaofushan/home/bean/ItemCommonList.java
  13. 4 0
      app/src/main/java/com/qingdaofushan/home/bean/UserInfo.java
  14. 1 1
      app/src/main/java/com/qingdaofushan/home/bean/appVMBean.java
  15. 1 1
      app/src/main/java/com/qingdaofushan/home/component/ApiController.java
  16. 2 2
      app/src/main/java/com/qingdaofushan/home/component/ApiInterceptor.java
  17. 1 1
      app/src/main/java/com/qingdaofushan/home/component/App.java
  18. 1 1
      app/src/main/java/com/qingdaofushan/home/component/AppConfig.java
  19. 1 1
      app/src/main/java/com/qingdaofushan/home/component/CoreService.java
  20. 1 1
      app/src/main/java/com/qingdaofushan/home/component/FileUtils.java
  21. 1 1
      app/src/main/java/com/qingdaofushan/home/component/NetUtils.java
  22. 3 3
      app/src/main/java/com/qingdaofushan/home/component/ServerManager.java
  23. 2 2
      app/src/main/java/com/qingdaofushan/home/data/ConstantData.java
  24. 5 5
      app/src/main/java/com/qingdaofushan/home/data/JsonCallBack.java
  25. 3 3
      app/src/main/java/com/qingdaofushan/home/data/Url.java
  26. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DefaultRetryPolicy.java
  27. 2 2
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadDispatcher.java
  28. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadManager.java
  29. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadRequest.java
  30. 2 2
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadRequestQueue.java
  31. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadStatusListener.java
  32. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadStatusListenerV1.java
  33. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/RetryError.java
  34. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/RetryPolicy.java
  35. 2 2
      app/src/main/java/com/qingdaofushan/home/downloadmanager/ThinDownloadManager.java
  36. 1 1
      app/src/main/java/com/qingdaofushan/home/downloadmanager/util/Log.java
  37. 1 1
      app/src/main/java/com/qingdaofushan/home/event/EventData.java
  38. 1 1
      app/src/main/java/com/qingdaofushan/home/utils/CompressUtil.java
  39. 1 1
      app/src/main/java/com/qingdaofushan/home/utils/DeviceUtil.java
  40. 1 1
      app/src/main/java/com/qingdaofushan/home/utils/SharedPreferenceUtil.java
  41. 3 3
      app/src/main/java/com/qingdaofushan/home/utils/ToastUtil.java
  42. 1 1
      app/src/main/java/com/qingdaofushan/home/utils/Uri2PathUtil.java
  43. 2 2
      app/src/main/java/com/qingdaofushan/home/view/DownloadDialog.java
  44. 13 13
      app/src/main/java/com/qingdaofushan/home/view/VersionCheckingUtil.java
  45. 6 6
      app/src/main/java/com/qingdaofushan/home/weiview/AndroidInterface.java
  46. 1 1
      app/src/main/java/com/qingdaofushan/home/weiview/AndroidWebView.java
  47. 7 7
      app/src/main/java/com/qingdaofushan/home/weiview/WebViewActivity.java
  48. 9 9
      app/src/main/java/com/qingdaofushan/home/zxing/activity/CaptureActivity.java
  49. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/camera/AutoFocusCallback.java
  50. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/camera/CameraConfigurationManager.java
  51. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/camera/CameraManager.java
  52. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/camera/FlashlightManager.java
  53. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/camera/PlanarYUVLuminanceSource.java
  54. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/camera/PreviewCallback.java
  55. 5 5
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/CaptureActivityHandler.java
  56. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeFormatManager.java
  57. 5 5
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeHandler.java
  58. 2 2
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeThread.java
  59. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/FinishListener.java
  60. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/InactivityTimer.java
  61. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/Intents.java
  62. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/decoding/RGBLuminanceSource.java
  63. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/encoding/EncodingHandler.java
  64. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/view/Constant.java
  65. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/view/UriUtil.java
  66. 1 1
      app/src/main/java/com/qingdaofushan/home/zxing/view/ViewfinderResultPointCallback.java
  67. 3 3
      app/src/main/java/com/qingdaofushan/home/zxing/view/ViewfinderView.java
  68. 0 4
      app/src/main/java/com/qingdaofushan/homecaresas/bean/UserInfo.java
  69. 1 1
      app/src/main/res/layout/activity_scanner.xml
  70. 1 1
      app/src/main/res/values/strings.xml

+ 1 - 0
.idea/.name

@@ -0,0 +1 @@
+HomeCareSAS

+ 2 - 0
.idea/misc.xml

@@ -8,8 +8,10 @@
         <entry key="app/src/main/res/drawable/progressbar_h_shape1.xml" value="0.20833333333333334" />
         <entry key="app/src/main/res/drawable/shape_custom_dialog.xml" value="0.20833333333333334" />
         <entry key="app/src/main/res/drawable/toast_background.xml" value="0.2212962962962963" />
+        <entry key="app/src/main/res/layout/activity_cam.xml" value="0.18297101449275363" />
         <entry key="app/src/main/res/layout/activity_live.xml" value="0.18931159420289856" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/activity_scanner.xml" value="0.18297101449275363" />
         <entry key="app/src/main/res/layout/activity_web.xml" value="0.2028985507246377" />
         <entry key="app/src/main/res/layout/layout_download_dialog.xml" value="0.1" />
         <entry key="app/src/main/res/layout/notification.xml" value="0.1" />

+ 1 - 1
app/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdk 29
 
     defaultConfig {
-        applicationId "com.qingdaofushan.homecaresas"
+        applicationId "com.qingdaofushan.home"
         minSdk 24
         targetSdk 29
         versionCode 1

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qingdaofushan.homecaresas">
+    package="com.qingdaofushan.home">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

+ 4 - 4
app/src/main/java/com/qingdaofushan/homecaresas/activity/CamActivity.java → app/src/main/java/com/qingdaofushan/home/activity/CamActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.activity;
+package com.qingdaofushan.home.activity;
 
 import android.Manifest;
 import android.content.ContentValues;
@@ -24,8 +24,8 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.core.os.EnvironmentCompat;
 
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.utils.Uri2PathUtil;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.utils.Uri2PathUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -145,7 +145,7 @@ public class CamActivity extends AppCompatActivity {
                     mCameraImagePath = photoFile.getAbsolutePath();
                     System.out.println("path = " + mCameraImagePath);
                     photoUri = FileProvider.getUriForFile(CamActivity.this,
-                            "com.qingdaofushan.homecaresas.fileprovider", photoFile);
+                            "com.qingdaofushan.home.fileprovider", photoFile);
                 }
             }
 

+ 4 - 4
app/src/main/java/com/qingdaofushan/homecaresas/activity/LiveActivity.java → app/src/main/java/com/qingdaofushan/home/activity/LiveActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.activity;
+package com.qingdaofushan.home.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -8,9 +8,9 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import com.qingdaofushan.homecaresas.event.EventData;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.utils.ToastUtil;
+import com.qingdaofushan.home.event.EventData;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.utils.ToastUtil;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import org.greenrobot.eventbus.EventBus;

+ 20 - 19
app/src/main/java/com/qingdaofushan/homecaresas/activity/MainActivity.java → app/src/main/java/com/qingdaofushan/home/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.activity;
+package com.qingdaofushan.home.activity;
 
 import static com.lzy.okgo.utils.HttpUtils.runOnUiThread;
 
@@ -28,19 +28,19 @@ import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.GetRequest;
 import com.lzy.okserver.OkDownload;
 import com.lzy.okserver.download.DownloadListener;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.bean.ExpandsBean;
-import com.qingdaofushan.homecaresas.bean.FetchUpBean;
-import com.qingdaofushan.homecaresas.bean.ItemCommonList;
-import com.qingdaofushan.homecaresas.bean.appVMBean;
-import com.qingdaofushan.homecaresas.component.ServerManager;
-import com.qingdaofushan.homecaresas.data.ConstantData;
-import com.qingdaofushan.homecaresas.data.JsonCallBack;
-import com.qingdaofushan.homecaresas.data.Url;
-import com.qingdaofushan.homecaresas.utils.CompressUtil;
-import com.qingdaofushan.homecaresas.utils.ToastUtil;
-import com.qingdaofushan.homecaresas.view.VersionCheckingUtil;
-import com.qingdaofushan.homecaresas.weiview.WebViewActivity;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.bean.ExpandsBean;
+import com.qingdaofushan.home.bean.FetchUpBean;
+import com.qingdaofushan.home.bean.ItemCommonList;
+import com.qingdaofushan.home.bean.appVMBean;
+import com.qingdaofushan.home.component.ServerManager;
+import com.qingdaofushan.home.data.ConstantData;
+import com.qingdaofushan.home.data.JsonCallBack;
+import com.qingdaofushan.home.data.Url;
+import com.qingdaofushan.home.utils.CompressUtil;
+import com.qingdaofushan.home.utils.ToastUtil;
+import com.qingdaofushan.home.view.VersionCheckingUtil;
+import com.qingdaofushan.home.weiview.WebViewActivity;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import java.io.File;
@@ -71,11 +71,12 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.start).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                mServerManager.startServer();
-                Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
-//                intent.putExtra("url", editText.getText().toString());
-                intent.putExtra("url", "http://127.0.0.1:8080");
-                startActivity(intent);
+                initApp("https://pwxmax.cn/homeLifemini.zip",1);
+//                mServerManager.startServer();
+//                Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
+////                intent.putExtra("url", editText.getText().toString());
+//                intent.putExtra("url", "http://127.0.0.1:8080");
+//                startActivity(intent);
             }
         });
     }

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/bean/AppUpDataItem.java → app/src/main/java/com/qingdaofushan/home/bean/AppUpDataItem.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.bean;
+package com.qingdaofushan.home.bean;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/bean/ExpandsBean.java → app/src/main/java/com/qingdaofushan/home/bean/ExpandsBean.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.bean;
+package com.qingdaofushan.home.bean;
 
 public class ExpandsBean {
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/bean/FetchUpBean.java → app/src/main/java/com/qingdaofushan/home/bean/FetchUpBean.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.bean;
+package com.qingdaofushan.home.bean;
 
 import java.util.List;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/bean/ItemCommon.java → app/src/main/java/com/qingdaofushan/home/bean/ItemCommon.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.bean;
+package com.qingdaofushan.home.bean;
 
 import com.google.gson.annotations.SerializedName;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/bean/ItemCommonList.java → app/src/main/java/com/qingdaofushan/home/bean/ItemCommonList.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.bean;
+package com.qingdaofushan.home.bean;
 
 import com.google.gson.annotations.SerializedName;
 

+ 4 - 0
app/src/main/java/com/qingdaofushan/home/bean/UserInfo.java

@@ -0,0 +1,4 @@
+package com.qingdaofushan.home.bean;
+
+public class UserInfo {
+}

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/bean/appVMBean.java → app/src/main/java/com/qingdaofushan/home/bean/appVMBean.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.bean;
+package com.qingdaofushan.home.bean;
 
 public class appVMBean {
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/component/ApiController.java → app/src/main/java/com/qingdaofushan/home/component/ApiController.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import com.yanzhenjie.andserver.annotation.Controller;
 import com.yanzhenjie.andserver.annotation.PostMapping;

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/component/ApiInterceptor.java → app/src/main/java/com/qingdaofushan/home/component/ApiInterceptor.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 
 import androidx.annotation.NonNull;
@@ -66,7 +66,7 @@ public class ApiInterceptor implements HandlerInterceptor {
 
     static {
         PROXY_PREFIXS = new HashMap<>();
-        PROXY_PREFIXS.put("/api", HttpHost.create("http://172.20.10.9:8080"));
+        PROXY_PREFIXS.put("/api", HttpHost.create("http://homelife.pwxmax.cn"));
         PROXY_PREFIXS.put("/api/v1", HttpHost.create("https://funingyuan.dev.qingdaofushan.com"));
         PROXY_PREFIXS.put("/api/store", HttpHost.create("https://funingyuan.dev.qingdaofushan.com"));
     }

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/component/App.java → app/src/main/java/com/qingdaofushan/home/component/App.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import android.app.Application;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/component/AppConfig.java → app/src/main/java/com/qingdaofushan/home/component/AppConfig.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import android.content.Context;
 import android.os.Environment;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/component/CoreService.java → app/src/main/java/com/qingdaofushan/home/component/CoreService.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import android.app.Service;
 import android.content.Intent;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/component/FileUtils.java → app/src/main/java/com/qingdaofushan/home/component/FileUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import android.os.Environment;
 import android.text.TextUtils;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/component/NetUtils.java → app/src/main/java/com/qingdaofushan/home/component/NetUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;

+ 3 - 3
app/src/main/java/com/qingdaofushan/homecaresas/component/ServerManager.java → app/src/main/java/com/qingdaofushan/home/component/ServerManager.java

@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.qingdaofushan.homecaresas.component;
+package com.qingdaofushan.home.component;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.qingdaofushan.homecaresas.activity.MainActivity;
+import com.qingdaofushan.home.activity.MainActivity;
 
 /**
  * Created by Zhenjie Yan on 2018/6/9.
  */
 public class ServerManager extends BroadcastReceiver {
 
-    private static final String ACTION = "com.qingdaofushan.homecaresas.receiver";
+    private static final String ACTION = "com.qingdaofushan.home.receiver";
 
     private static final String CMD_KEY = "CMD_KEY";
     private static final String MESSAGE_KEY = "MESSAGE_KEY";

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/data/ConstantData.java → app/src/main/java/com/qingdaofushan/home/data/ConstantData.java

@@ -1,9 +1,9 @@
-package com.qingdaofushan.homecaresas.data;
+package com.qingdaofushan.home.data;
 
 
 import android.os.Environment;
 
-import com.qingdaofushan.homecaresas.bean.UserInfo;
+import com.qingdaofushan.home.bean.UserInfo;
 
 
 /**

+ 5 - 5
app/src/main/java/com/qingdaofushan/homecaresas/data/JsonCallBack.java → app/src/main/java/com/qingdaofushan/home/data/JsonCallBack.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.data;
+package com.qingdaofushan.home.data;
 
 
 import com.google.gson.Gson;
@@ -7,10 +7,10 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.AbsCallback;
 import com.lzy.okgo.model.HttpHeaders;
 import com.lzy.okgo.request.base.Request;
-import com.qingdaofushan.homecaresas.bean.ItemCommon;
-import com.qingdaofushan.homecaresas.bean.ItemCommonList;
-import com.qingdaofushan.homecaresas.bean.UserInfo;
-import com.qingdaofushan.homecaresas.utils.ToastUtil;
+import com.qingdaofushan.home.bean.ItemCommon;
+import com.qingdaofushan.home.bean.ItemCommonList;
+import com.qingdaofushan.home.bean.UserInfo;
+import com.qingdaofushan.home.utils.ToastUtil;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

+ 3 - 3
app/src/main/java/com/qingdaofushan/homecaresas/data/Url.java → app/src/main/java/com/qingdaofushan/home/data/Url.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.data;
+package com.qingdaofushan.home.data;
 
 /**
  * Author:PwxMax
@@ -9,8 +9,8 @@ public class Url {
 
     private static boolean isOutTest = true;
 
-    private static String baseInnerUrl = "http://192.168.1.6:8080/api/hlmini/";
-    private static final String baseOutUrl = "http://192.168.1.6:8080/api/hlmini/";
+    private static String baseInnerUrl = "http://homelife.pwxmax.cn/api/hlmini/";
+    private static final String baseOutUrl = "http://homelife.pwxmax.cn/api/hlmini/";
 //    public static final String IMGUrl = GlobalConstant.URL.replace("api/", "");
     private static String baseUrl;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DefaultRetryPolicy.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DefaultRetryPolicy.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 /**
  * Created by maniselvaraj on 15/4/15.

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DownloadDispatcher.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadDispatcher.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 import static android.content.ContentValues.TAG;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
@@ -12,7 +12,7 @@ import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
 import android.os.Process;
 
 
-import com.qingdaofushan.homecaresas.downloadmanager.util.Log;
+import com.qingdaofushan.home.downloadmanager.util.Log;
 
 import org.apache.http.conn.ConnectTimeoutException;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DownloadManager.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadManager.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 public interface DownloadManager {
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DownloadRequest.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadRequest.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 import android.net.Uri;
 

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DownloadRequestQueue.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadRequestQueue.java

@@ -1,10 +1,10 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 import android.os.Handler;
 import android.os.Looper;
 
 
-import com.qingdaofushan.homecaresas.downloadmanager.util.Log;
+import com.qingdaofushan.home.downloadmanager.util.Log;
 
 import java.security.InvalidParameterException;
 import java.util.HashSet;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DownloadStatusListener.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadStatusListener.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 public interface DownloadStatusListener {
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/DownloadStatusListenerV1.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadStatusListenerV1.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 /**
  * A Listener for the Download Status. Implement this interface to listen to Download Events.

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/RetryError.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/RetryError.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 /**
  * Created by maniselvaraj on 15/4/15.

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/RetryPolicy.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/RetryPolicy.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 /**
  * Created by maniselvaraj on 15/4/15.

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/ThinDownloadManager.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/ThinDownloadManager.java

@@ -1,9 +1,9 @@
-package com.qingdaofushan.homecaresas.downloadmanager;
+package com.qingdaofushan.home.downloadmanager;
 
 import android.os.Handler;
 
 
-import com.qingdaofushan.homecaresas.downloadmanager.util.Log;
+import com.qingdaofushan.home.downloadmanager.util.Log;
 
 import java.security.InvalidParameterException;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/downloadmanager/util/Log.java → app/src/main/java/com/qingdaofushan/home/downloadmanager/util/Log.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.downloadmanager.util;
+package com.qingdaofushan.home.downloadmanager.util;
 
 public final class Log {
     private static String sTag = "ThinDownloadManager";

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/event/EventData.java → app/src/main/java/com/qingdaofushan/home/event/EventData.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.event;
+package com.qingdaofushan.home.event;
 
 public class EventData {
     String msg;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/utils/CompressUtil.java → app/src/main/java/com/qingdaofushan/home/utils/CompressUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.utils;
+package com.qingdaofushan.home.utils;
 import androidx.annotation.Size;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/utils/DeviceUtil.java → app/src/main/java/com/qingdaofushan/home/utils/DeviceUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.utils;
+package com.qingdaofushan.home.utils;
 
 import android.app.Activity;
 import android.app.ActivityManager;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/utils/SharedPreferenceUtil.java → app/src/main/java/com/qingdaofushan/home/utils/SharedPreferenceUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.utils;
+package com.qingdaofushan.home.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;

+ 3 - 3
app/src/main/java/com/qingdaofushan/homecaresas/utils/ToastUtil.java → app/src/main/java/com/qingdaofushan/home/utils/ToastUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.utils;
+package com.qingdaofushan.home.utils;
 
 import android.content.Context;
 import android.view.Gravity;
@@ -8,8 +8,8 @@ import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.component.App;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.component.App;
 
 
 public class ToastUtil {

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/utils/Uri2PathUtil.java → app/src/main/java/com/qingdaofushan/home/utils/Uri2PathUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.utils;
+package com.qingdaofushan.home.utils;
 import android.annotation.TargetApi;
 import android.content.ContentUris;
 import android.content.Context;

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/view/DownloadDialog.java → app/src/main/java/com/qingdaofushan/home/view/DownloadDialog.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.view;
+package com.qingdaofushan.home.view;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.qingdaofushan.homecaresas.R;
+import com.qingdaofushan.home.R;
 
 import java.lang.ref.WeakReference;
 

+ 13 - 13
app/src/main/java/com/qingdaofushan/homecaresas/view/VersionCheckingUtil.java → app/src/main/java/com/qingdaofushan/home/view/VersionCheckingUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.view;
+package com.qingdaofushan.home.view;
 
 import static android.os.Build.VERSION_CODES.Q;
 
@@ -24,17 +24,17 @@ import com.lzy.okgo.request.GetRequest;
 import com.lzy.okserver.OkDownload;
 import com.lzy.okserver.download.DownloadListener;
 import com.lzy.okserver.download.DownloadTask;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.activity.MainActivity;
-import com.qingdaofushan.homecaresas.bean.appVMBean;
-import com.qingdaofushan.homecaresas.component.App;
-import com.qingdaofushan.homecaresas.bean.AppUpDataItem;
-import com.qingdaofushan.homecaresas.downloadmanager.DefaultRetryPolicy;
-import com.qingdaofushan.homecaresas.downloadmanager.DownloadRequest;
-import com.qingdaofushan.homecaresas.downloadmanager.DownloadStatusListener;
-import com.qingdaofushan.homecaresas.downloadmanager.ThinDownloadManager;
-import com.qingdaofushan.homecaresas.utils.DeviceUtil;
-import com.qingdaofushan.homecaresas.utils.ToastUtil;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.activity.MainActivity;
+import com.qingdaofushan.home.bean.appVMBean;
+import com.qingdaofushan.home.component.App;
+import com.qingdaofushan.home.bean.AppUpDataItem;
+import com.qingdaofushan.home.downloadmanager.DefaultRetryPolicy;
+import com.qingdaofushan.home.downloadmanager.DownloadRequest;
+import com.qingdaofushan.home.downloadmanager.DownloadStatusListener;
+import com.qingdaofushan.home.downloadmanager.ThinDownloadManager;
+import com.qingdaofushan.home.utils.DeviceUtil;
+import com.qingdaofushan.home.utils.ToastUtil;
 
 import java.io.File;
 
@@ -225,7 +225,7 @@ public class VersionCheckingUtil {
 //            mkeyTime = System.currentTimeMillis();
 //            ToastUtils.show("再按一次退出程序");
 //        } else {
-//            Intent intent = new Intent("com.qingdaofushan.homecaresas.mvp.base.BaseMvpActivity");
+//            Intent intent = new Intent("com.qingdaofushan.home.mvp.base.BaseMvpActivity");
 //            intent.putExtra("closeAll", 1);
 //            mContext.sendBroadcast(intent);//发送广播
 //            Activity activity = null;

+ 6 - 6
app/src/main/java/com/qingdaofushan/homecaresas/weiview/AndroidInterface.java → app/src/main/java/com/qingdaofushan/home/weiview/AndroidInterface.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.weiview;
+package com.qingdaofushan.home.weiview;
 
 import static com.just.agentweb.ActionActivity.REQUEST_CODE;
 
@@ -9,11 +9,11 @@ import android.os.Looper;
 import android.webkit.JavascriptInterface;
 
 import com.just.agentweb.AgentWeb;
-import com.qingdaofushan.homecaresas.activity.LiveActivity;
-import com.qingdaofushan.homecaresas.event.EventData;
-import com.qingdaofushan.homecaresas.utils.SharedPreferenceUtil;
-import com.qingdaofushan.homecaresas.utils.ToastUtil;
-import com.qingdaofushan.homecaresas.zxing.activity.CaptureActivity;
+import com.qingdaofushan.home.activity.LiveActivity;
+import com.qingdaofushan.home.event.EventData;
+import com.qingdaofushan.home.utils.SharedPreferenceUtil;
+import com.qingdaofushan.home.utils.ToastUtil;
+import com.qingdaofushan.home.zxing.activity.CaptureActivity;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/weiview/AndroidWebView.java → app/src/main/java/com/qingdaofushan/home/weiview/AndroidWebView.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.weiview;
+package com.qingdaofushan.home.weiview;
 
 import android.app.Activity;
 import android.graphics.Rect;

+ 7 - 7
app/src/main/java/com/qingdaofushan/homecaresas/weiview/WebViewActivity.java → app/src/main/java/com/qingdaofushan/home/weiview/WebViewActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.weiview;
+package com.qingdaofushan.home.weiview;
 
 import android.Manifest;
 import android.content.ContentValues;
@@ -32,11 +32,11 @@ import com.just.agentweb.PermissionInterceptor;
 import com.just.agentweb.WebChromeClient;
 import com.just.agentweb.WebViewClient;
 //import com.king.zxing.CameraScan;
-import com.qingdaofushan.homecaresas.activity.CamActivity;
-import com.qingdaofushan.homecaresas.event.EventData;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.utils.Uri2PathUtil;
-import com.qingdaofushan.homecaresas.zxing.view.Constant;
+import com.qingdaofushan.home.activity.CamActivity;
+import com.qingdaofushan.home.event.EventData;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.utils.Uri2PathUtil;
+import com.qingdaofushan.home.zxing.view.Constant;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -264,7 +264,7 @@ public class WebViewActivity extends AppCompatActivity {
                     mCameraImagePath = photoFile.getAbsolutePath();
                     System.out.println("path = " + mCameraImagePath);
                     photoUri = FileProvider.getUriForFile(WebViewActivity.this,
-                            "com.qingdaofushan.homecaresas.fileprovider", photoFile);
+                            "com.qingdaofushan.home.fileprovider", photoFile);
                 }
             }
 

+ 9 - 9
app/src/main/java/com/qingdaofushan/homecaresas/zxing/activity/CaptureActivity.java → app/src/main/java/com/qingdaofushan/home/zxing/activity/CaptureActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.zxing.activity;
+package com.qingdaofushan.home.zxing.activity;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -32,14 +32,14 @@ import com.google.zxing.NotFoundException;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.qrcode.QRCodeReader;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.zxing.camera.CameraManager;
-import com.qingdaofushan.homecaresas.zxing.decoding.CaptureActivityHandler;
-import com.qingdaofushan.homecaresas.zxing.decoding.InactivityTimer;
-import com.qingdaofushan.homecaresas.zxing.decoding.RGBLuminanceSource;
-import com.qingdaofushan.homecaresas.zxing.view.Constant;
-import com.qingdaofushan.homecaresas.zxing.view.UriUtil;
-import com.qingdaofushan.homecaresas.zxing.view.ViewfinderView;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.zxing.camera.CameraManager;
+import com.qingdaofushan.home.zxing.decoding.CaptureActivityHandler;
+import com.qingdaofushan.home.zxing.decoding.InactivityTimer;
+import com.qingdaofushan.home.zxing.decoding.RGBLuminanceSource;
+import com.qingdaofushan.home.zxing.view.Constant;
+import com.qingdaofushan.home.zxing.view.UriUtil;
+import com.qingdaofushan.home.zxing.view.ViewfinderView;
 
 import java.io.IOException;
 import java.util.Hashtable;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/camera/AutoFocusCallback.java → app/src/main/java/com/qingdaofushan/home/zxing/camera/AutoFocusCallback.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.camera;
+package com.qingdaofushan.home.zxing.camera;
 
 import android.hardware.Camera;
 import android.os.Handler;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/camera/CameraConfigurationManager.java → app/src/main/java/com/qingdaofushan/home/zxing/camera/CameraConfigurationManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.camera;
+package com.qingdaofushan.home.zxing.camera;
 
 import android.content.Context;
 import android.graphics.Point;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/camera/CameraManager.java → app/src/main/java/com/qingdaofushan/home/zxing/camera/CameraManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.camera;
+package com.qingdaofushan.home.zxing.camera;
 
 import android.content.Context;
 import android.graphics.PixelFormat;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/camera/FlashlightManager.java → app/src/main/java/com/qingdaofushan/home/zxing/camera/FlashlightManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.camera;
+package com.qingdaofushan.home.zxing.camera;
 
 import android.os.IBinder;
 import android.util.Log;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/camera/PlanarYUVLuminanceSource.java → app/src/main/java/com/qingdaofushan/home/zxing/camera/PlanarYUVLuminanceSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.camera;
+package com.qingdaofushan.home.zxing.camera;
 
 import android.graphics.Bitmap;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/camera/PreviewCallback.java → app/src/main/java/com/qingdaofushan/home/zxing/camera/PreviewCallback.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.camera;
+package com.qingdaofushan.home.zxing.camera;
 
 import android.graphics.Point;
 import android.hardware.Camera;

+ 5 - 5
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/CaptureActivityHandler.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/CaptureActivityHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -27,10 +27,10 @@ import android.util.Log;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.zxing.activity.CaptureActivity;
-import com.qingdaofushan.homecaresas.zxing.camera.CameraManager;
-import com.qingdaofushan.homecaresas.zxing.view.ViewfinderResultPointCallback;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.zxing.activity.CaptureActivity;
+import com.qingdaofushan.home.zxing.camera.CameraManager;
+import com.qingdaofushan.home.zxing.view.ViewfinderResultPointCallback;
 
 import java.util.Vector;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/DecodeFormatManager.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeFormatManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.content.Intent;
 import android.net.Uri;

+ 5 - 5
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/DecodeHandler.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -28,10 +28,10 @@ import com.google.zxing.MultiFormatReader;
 import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.zxing.activity.CaptureActivity;
-import com.qingdaofushan.homecaresas.zxing.camera.CameraManager;
-import com.qingdaofushan.homecaresas.zxing.camera.PlanarYUVLuminanceSource;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.zxing.activity.CaptureActivity;
+import com.qingdaofushan.home.zxing.camera.CameraManager;
+import com.qingdaofushan.home.zxing.camera.PlanarYUVLuminanceSource;
 
 import java.util.Hashtable;
 

+ 2 - 2
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/DecodeThread.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeThread.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -22,7 +22,7 @@ import android.os.Looper;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.ResultPointCallback;
-import com.qingdaofushan.homecaresas.zxing.activity.CaptureActivity;
+import com.qingdaofushan.home.zxing.activity.CaptureActivity;
 
 import java.util.Hashtable;
 import java.util.Vector;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/FinishListener.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/FinishListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.app.Activity;
 import android.content.DialogInterface;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/InactivityTimer.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/InactivityTimer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.app.Activity;
 

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/Intents.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/Intents.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 /**
  * This class provides the constants to use when sending an Intent to Barcode Scanner.

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/decoding/RGBLuminanceSource.java → app/src/main/java/com/qingdaofushan/home/zxing/decoding/RGBLuminanceSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.decoding;
+package com.qingdaofushan.home.zxing.decoding;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/encoding/EncodingHandler.java → app/src/main/java/com/qingdaofushan/home/zxing/encoding/EncodingHandler.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.zxing.encoding;
+package com.qingdaofushan.home.zxing.encoding;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/view/Constant.java → app/src/main/java/com/qingdaofushan/home/zxing/view/Constant.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.zxing.view;
+package com.qingdaofushan.home.zxing.view;
 
 /**
  * 常量

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/view/UriUtil.java → app/src/main/java/com/qingdaofushan/home/zxing/view/UriUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.homecaresas.zxing.view;
+package com.qingdaofushan.home.zxing.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;

+ 1 - 1
app/src/main/java/com/qingdaofushan/homecaresas/zxing/view/ViewfinderResultPointCallback.java → app/src/main/java/com/qingdaofushan/home/zxing/view/ViewfinderResultPointCallback.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.view;
+package com.qingdaofushan.home.zxing.view;
 
 import com.google.zxing.ResultPoint;
 import com.google.zxing.ResultPointCallback;

+ 3 - 3
app/src/main/java/com/qingdaofushan/homecaresas/zxing/view/ViewfinderView.java → app/src/main/java/com/qingdaofushan/home/zxing/view/ViewfinderView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.homecaresas.zxing.view;
+package com.qingdaofushan.home.zxing.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -33,8 +33,8 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import com.google.zxing.ResultPoint;
-import com.qingdaofushan.homecaresas.R;
-import com.qingdaofushan.homecaresas.zxing.camera.CameraManager;
+import com.qingdaofushan.home.R;
+import com.qingdaofushan.home.zxing.camera.CameraManager;
 
 import java.util.Collection;
 import java.util.HashSet;

+ 0 - 4
app/src/main/java/com/qingdaofushan/homecaresas/bean/UserInfo.java

@@ -1,4 +0,0 @@
-package com.qingdaofushan.homecaresas.bean;
-
-public class UserInfo {
-}

+ 1 - 1
app/src/main/res/layout/activity_scanner.xml

@@ -16,7 +16,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center" />
 
-        <com.qingdaofushan.homecaresas.zxing.view.ViewfinderView
+        <com.qingdaofushan.home.zxing.view.ViewfinderView
             android:id="@+id/viewfinder_content"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">居家养老</string>
-    <string name="FILE_PROVIDER">com.qingdaofushan.homecaresas.fileprovider</string>
+    <string name="FILE_PROVIDER">com.qingdaofushan.home.fileprovider</string>
 </resources>