one

.idea/.name

@@ -1 +1 @@
-HomeCareSAS
+NewFny

.idea/misc.xml

@@ -4,6 +4,8 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../../../layout/custom_preview.xml" value="0.20925925925925926" />
+        <entry key="..\:/Users/PwxMaxWork/StudioProjects/mobile-institutional-nursing/app/src/main/res/layout/activity_main.xml" value="0.358695652173913" />
+        <entry key="..\:/Users/PwxMaxWork/StudioProjects/mobile-newfny/app/src/main/res/layout/activity_main.xml" value="0.358695652173913" />
         <entry key="VideoCall/src/main/res/drawable/common_button_bg.xml" value="0.2765625" />
         <entry key="VideoCall/src/main/res/drawable/un_button_bg.xml" value="0.2765625" />
         <entry key="VideoCall/src/main/res/layout/videocall_activit_enter.xml" value="0.13489583333333333" />

app/build.gradle

@@ -4,10 +4,10 @@ android {
     compileSdk 29
 
     defaultConfig {
-        applicationId "com.qingdaofushan.home"
+        applicationId "com.rdgk.cemetery"
         minSdk 22
         targetSdk 29
-        versionCode 5
+        versionCode 13
         versionName "1.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,7 +42,7 @@ dependencies {
 
 
     // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:12.0'
+    implementation 'com.github.getActivity:XXPermissions:13.5'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
 
     // 解析数据 gson

app/release/output-metadata.json

@@ -4,14 +4,14 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.qingdaofushan.home",
+  "applicationId": "com.rdgk.cemetery",
   "variantName": "processReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 13,
+      "versionName": "1.1.1",
       "outputFile": "app-release.apk"
     }
   ]

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.home">
+    package="com.rdgk.cemetery">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -24,7 +24,7 @@
     <application
         android:name=".component.App"
         android:allowBackup="true"
-        android:icon="@mipmap/icon_laoren_logo"
+        android:icon="@mipmap/icon_fny_logo"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"

app/src/main/java/com/qingdaofushan/home/bean/UserInfo.java

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

app/src/main/java/com/qingdaofushan/home/activity/CamActivity.java → app/src/main/java/com/rdgk/cemetery/activity/CamActivity.java

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

app/src/main/java/com/qingdaofushan/home/activity/MainActivity.java → app/src/main/java/com/rdgk/cemetery/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.activity;
+package com.rdgk.cemetery.activity;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -23,20 +23,20 @@ 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.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.SharedPreferenceUtil;
-import com.qingdaofushan.home.utils.ToastUtil;
-import com.qingdaofushan.home.view.VersionCheckingUtil;
-import com.qingdaofushan.home.weiview.WebViewActivity;
+import com.rdgk.cemetery.R;
+import com.rdgk.cemetery.bean.ExpandsBean;
+import com.rdgk.cemetery.bean.FetchUpBean;
+import com.rdgk.cemetery.bean.ItemCommonList;
+import com.rdgk.cemetery.bean.appVMBean;
+import com.rdgk.cemetery.component.ServerManager;
+import com.rdgk.cemetery.data.ConstantData;
+import com.rdgk.cemetery.data.JsonCallBack;
+import com.rdgk.cemetery.data.Url;
+import com.rdgk.cemetery.utils.CompressUtil;
+import com.rdgk.cemetery.utils.SharedPreferenceUtil;
+import com.rdgk.cemetery.utils.ToastUtil;
+import com.rdgk.cemetery.view.VersionCheckingUtil;
+import com.rdgk.cemetery.weiview.WebViewActivity;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -273,7 +273,7 @@ public class MainActivity extends AppCompatActivity {
         if (requestCode == XXPermissions.REQUEST_CODE) {
             if (XXPermissions.isGranted(this, Permission.WRITE_EXTERNAL_STORAGE)
                     && XXPermissions.isGranted(this, Permission.READ_EXTERNAL_STORAGE)
-                    && XXPermissions.isGranted(this, Permission.CAMERA) ) {
+                    && XXPermissions.isGranted(this, Permission.CAMERA)) {
 
             } else {
                 ToastUtil.showToast("权限未正常获取");

app/src/main/java/com/qingdaofushan/home/activity/NfcActivity.java → app/src/main/java/com/rdgk/cemetery/activity/NfcActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.activity;
+package com.rdgk.cemetery.activity;
 
 import android.Manifest;
 import android.app.AlertDialog;
@@ -18,7 +18,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import com.qingdaofushan.home.R;
+import com.rdgk.cemetery.R;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

app/src/main/java/com/qingdaofushan/home/activity/SimplePlayer.java → app/src/main/java/com/rdgk/cemetery/activity/SimplePlayer.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.activity;
+package com.rdgk.cemetery.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,7 +7,7 @@ import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.qingdaofushan.home.R;
+import com.rdgk.cemetery.R;
 import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils;
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;

app/src/main/java/com/qingdaofushan/home/bean/AppUpDataItem.java → app/src/main/java/com/rdgk/cemetery/bean/AppUpDataItem.java

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

app/src/main/java/com/qingdaofushan/home/bean/ExpandsBean.java → app/src/main/java/com/rdgk/cemetery/bean/ExpandsBean.java

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

app/src/main/java/com/qingdaofushan/home/bean/FetchUpBean.java → app/src/main/java/com/rdgk/cemetery/bean/FetchUpBean.java

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

app/src/main/java/com/qingdaofushan/home/bean/ItemCommon.java → app/src/main/java/com/rdgk/cemetery/bean/ItemCommon.java

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

app/src/main/java/com/qingdaofushan/home/bean/ItemCommonList.java → app/src/main/java/com/rdgk/cemetery/bean/ItemCommonList.java

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

app/src/main/java/com/rdgk/cemetery/bean/UserInfo.java

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

app/src/main/java/com/qingdaofushan/home/bean/appVMBean.java → app/src/main/java/com/rdgk/cemetery/bean/appVMBean.java

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

app/src/main/java/com/qingdaofushan/home/component/ApiController.java → app/src/main/java/com/rdgk/cemetery/component/ApiController.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.component;
+package com.rdgk.cemetery.component;
 
 import com.yanzhenjie.andserver.annotation.Controller;
 import com.yanzhenjie.andserver.annotation.RequestMapping;

app/src/main/java/com/qingdaofushan/home/component/ApiInterceptor.java → app/src/main/java/com/rdgk/cemetery/component/ApiInterceptor.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.component;
+package com.rdgk.cemetery.component;
 
 
 import android.util.Log;

app/src/main/java/com/qingdaofushan/home/component/App.java → app/src/main/java/com/rdgk/cemetery/component/App.java

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

app/src/main/java/com/qingdaofushan/home/component/AppConfig.java → app/src/main/java/com/rdgk/cemetery/component/AppConfig.java

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

app/src/main/java/com/qingdaofushan/home/component/CoreService.java → app/src/main/java/com/rdgk/cemetery/component/CoreService.java

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

app/src/main/java/com/qingdaofushan/home/component/FileUtils.java → app/src/main/java/com/rdgk/cemetery/component/FileUtils.java

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

app/src/main/java/com/qingdaofushan/home/component/NetUtils.java → app/src/main/java/com/rdgk/cemetery/component/NetUtils.java

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

app/src/main/java/com/qingdaofushan/home/component/ServerManager.java → app/src/main/java/com/rdgk/cemetery/component/ServerManager.java

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

app/src/main/java/com/qingdaofushan/home/data/ConstantData.java → app/src/main/java/com/rdgk/cemetery/data/ConstantData.java

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

app/src/main/java/com/qingdaofushan/home/data/JsonCallBack.java → app/src/main/java/com/rdgk/cemetery/data/JsonCallBack.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.data;
+package com.rdgk.cemetery.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.home.bean.ItemCommon;
-import com.qingdaofushan.home.bean.ItemCommonList;
-import com.qingdaofushan.home.bean.UserInfo;
-import com.qingdaofushan.home.utils.ToastUtil;
+import com.rdgk.cemetery.bean.ItemCommon;
+import com.rdgk.cemetery.bean.ItemCommonList;
+import com.rdgk.cemetery.bean.UserInfo;
+import com.rdgk.cemetery.utils.ToastUtil;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

app/src/main/java/com/qingdaofushan/home/data/Url.java → app/src/main/java/com/rdgk/cemetery/data/Url.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.data;
+package com.rdgk.cemetery.data;
 
 /**
  * Author：PwxMax

app/src/main/java/com/qingdaofushan/home/downloadmanager/DefaultRetryPolicy.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DefaultRetryPolicy.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadDispatcher.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DownloadDispatcher.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.downloadmanager;
+package com.rdgk.cemetery.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.home.downloadmanager.util.Log;
+import com.rdgk.cemetery.downloadmanager.util.Log;
 
 import org.apache.http.conn.ConnectTimeoutException;
 

app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadManager.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DownloadManager.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadRequest.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DownloadRequest.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadRequestQueue.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DownloadRequestQueue.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadStatusListener.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DownloadStatusListener.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/DownloadStatusListenerV1.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/DownloadStatusListenerV1.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/RetryError.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/RetryError.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/RetryPolicy.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/RetryPolicy.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/ThinDownloadManager.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/ThinDownloadManager.java

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

app/src/main/java/com/qingdaofushan/home/downloadmanager/util/Log.java → app/src/main/java/com/rdgk/cemetery/downloadmanager/util/Log.java

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

app/src/main/java/com/qingdaofushan/home/event/EventData.java → app/src/main/java/com/rdgk/cemetery/event/EventData.java

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

app/src/main/java/com/qingdaofushan/home/event/EventMp3.java → app/src/main/java/com/rdgk/cemetery/event/EventMp3.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.event;
+package com.rdgk.cemetery.event;
 
 public class EventMp3 {
     String msg;

app/src/main/java/com/qingdaofushan/home/utils/CompressUtil.java → app/src/main/java/com/rdgk/cemetery/utils/CompressUtil.java

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

app/src/main/java/com/qingdaofushan/home/utils/SharedPreferenceUtil.java → app/src/main/java/com/rdgk/cemetery/utils/SharedPreferenceUtil.java

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

app/src/main/java/com/qingdaofushan/home/utils/ToastUtil.java → app/src/main/java/com/rdgk/cemetery/utils/ToastUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.utils;
+package com.rdgk.cemetery.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.home.R;
-import com.qingdaofushan.home.component.App;
+import com.rdgk.cemetery.R;
+import com.rdgk.cemetery.component.App;
 
 
 public class ToastUtil {

app/src/main/java/com/qingdaofushan/home/utils/Uri2PathUtil.java → app/src/main/java/com/rdgk/cemetery/utils/Uri2PathUtil.java

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

app/src/main/java/com/qingdaofushan/home/view/DownloadDialog.java → app/src/main/java/com/rdgk/cemetery/view/DownloadDialog.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.view;
+package com.rdgk.cemetery.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.home.R;
+import com.rdgk.cemetery.R;
 
 import java.lang.ref.WeakReference;
 

app/src/main/java/com/qingdaofushan/home/view/VersionCheckingUtil.java → app/src/main/java/com/rdgk/cemetery/view/VersionCheckingUtil.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.view;
+package com.rdgk.cemetery.view;
 
 import static android.os.Build.VERSION_CODES.Q;
 
@@ -24,16 +24,16 @@ 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.home.R;
-import com.qingdaofushan.home.activity.MainActivity;
-import com.qingdaofushan.home.bean.appVMBean;
-import com.qingdaofushan.home.component.App;
-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.rdgk.cemetery.R;
+import com.rdgk.cemetery.activity.MainActivity;
+import com.rdgk.cemetery.bean.appVMBean;
+import com.rdgk.cemetery.component.App;
+import com.rdgk.cemetery.downloadmanager.DefaultRetryPolicy;
+import com.rdgk.cemetery.downloadmanager.DownloadRequest;
+import com.rdgk.cemetery.downloadmanager.DownloadStatusListener;
+import com.rdgk.cemetery.downloadmanager.ThinDownloadManager;
 import com.tencent.trtc.videocall.DeviceUtil;
-import com.qingdaofushan.home.utils.ToastUtil;
+import com.rdgk.cemetery.utils.ToastUtil;
 
 import java.io.File;
 
@@ -224,7 +224,7 @@ public class VersionCheckingUtil {
 //            mkeyTime = System.currentTimeMillis();
 //            ToastUtils.show("再按一次退出程序");
 //        } else {
-//            Intent intent = new Intent("com.qingdaofushan.home.mvp.base.BaseMvpActivity");
+//            Intent intent = new Intent("com.rdgk.cemetery.mvp.base.BaseMvpActivity");
 //            intent.putExtra("closeAll", 1);
 //            mContext.sendBroadcast(intent);//发送广播
 //            Activity activity = null;

app/src/main/java/com/qingdaofushan/home/weiview/AndroidInterface.java → app/src/main/java/com/rdgk/cemetery/weiview/AndroidInterface.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.weiview;
+package com.rdgk.cemetery.weiview;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -7,11 +7,11 @@ import android.os.Looper;
 import android.webkit.JavascriptInterface;
 
 import com.just.agentweb.AgentWeb;
-import com.qingdaofushan.home.event.EventData;
-import com.qingdaofushan.home.event.EventMp3;
-import com.qingdaofushan.home.utils.SharedPreferenceUtil;
-import com.qingdaofushan.home.utils.ToastUtil;
-import com.qingdaofushan.home.zxing.activity.CaptureActivity;
+import com.rdgk.cemetery.event.EventData;
+import com.rdgk.cemetery.event.EventMp3;
+import com.rdgk.cemetery.utils.SharedPreferenceUtil;
+import com.rdgk.cemetery.utils.ToastUtil;
+import com.rdgk.cemetery.zxing.activity.CaptureActivity;
 import com.tencent.trtc.videocall.Constant;
 import com.tencent.trtc.videocall.TrtcEventT;
 import com.tencent.trtc.videocall.VideoCallingActivity;

app/src/main/java/com/qingdaofushan/home/weiview/AndroidWebView.java → app/src/main/java/com/rdgk/cemetery/weiview/AndroidWebView.java

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

app/src/main/java/com/qingdaofushan/home/weiview/WebViewActivity.java → app/src/main/java/com/rdgk/cemetery/weiview/WebViewActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.weiview;
+package com.rdgk.cemetery.weiview;
 
 import android.Manifest;
 import android.annotation.TargetApi;
@@ -39,12 +39,12 @@ import com.just.agentweb.PermissionInterceptor;
 import com.just.agentweb.WebChromeClient;
 import com.just.agentweb.WebViewClient;
 //import com.king.zxing.CameraScan;
-import com.qingdaofushan.home.activity.NfcActivity;
-import com.qingdaofushan.home.event.EventData;
-import com.qingdaofushan.home.R;
-import com.qingdaofushan.home.event.EventMp3;
+import com.rdgk.cemetery.activity.NfcActivity;
+import com.rdgk.cemetery.event.EventData;
+import com.rdgk.cemetery.R;
+import com.rdgk.cemetery.event.EventMp3;
 import com.tencent.trtc.videocall.TrtcEvent;
-import com.qingdaofushan.home.utils.ToastUtil;
+import com.rdgk.cemetery.utils.ToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -530,7 +530,7 @@ public class WebViewActivity extends NfcActivity {
                     mCameraImagePath = photoFile.getAbsolutePath();
                     System.out.println("path = " + mCameraImagePath);
                     photoUri = FileProvider.getUriForFile(WebViewActivity.this,
-                            "com.qingdaofushan.home.fileprovider", photoFile);
+                            "com.rdgk.cemetery.fileprovider", photoFile);
                 }
             }
 

app/src/main/java/com/qingdaofushan/home/zxing/activity/CaptureActivity.java → app/src/main/java/com/rdgk/cemetery/zxing/activity/CaptureActivity.java

@@ -1,4 +1,4 @@
-package com.qingdaofushan.home.zxing.activity;
+package com.rdgk.cemetery.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.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 com.rdgk.cemetery.R;
+import com.rdgk.cemetery.zxing.camera.CameraManager;
+import com.rdgk.cemetery.zxing.decoding.CaptureActivityHandler;
+import com.rdgk.cemetery.zxing.decoding.InactivityTimer;
+import com.rdgk.cemetery.zxing.decoding.RGBLuminanceSource;
+import com.rdgk.cemetery.zxing.view.Constant;
+import com.rdgk.cemetery.zxing.view.UriUtil;
+import com.rdgk.cemetery.zxing.view.ViewfinderView;
 
 import java.io.IOException;
 import java.util.Hashtable;

app/src/main/java/com/qingdaofushan/home/zxing/camera/AutoFocusCallback.java → app/src/main/java/com/rdgk/cemetery/zxing/camera/AutoFocusCallback.java

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

app/src/main/java/com/qingdaofushan/home/zxing/camera/CameraConfigurationManager.java → app/src/main/java/com/rdgk/cemetery/zxing/camera/CameraConfigurationManager.java

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

app/src/main/java/com/qingdaofushan/home/zxing/camera/CameraManager.java → app/src/main/java/com/rdgk/cemetery/zxing/camera/CameraManager.java

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

app/src/main/java/com/qingdaofushan/home/zxing/camera/FlashlightManager.java → app/src/main/java/com/rdgk/cemetery/zxing/camera/FlashlightManager.java

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

app/src/main/java/com/qingdaofushan/home/zxing/camera/PlanarYUVLuminanceSource.java → app/src/main/java/com/rdgk/cemetery/zxing/camera/PlanarYUVLuminanceSource.java

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

app/src/main/java/com/qingdaofushan/home/zxing/camera/PreviewCallback.java → app/src/main/java/com/rdgk/cemetery/zxing/camera/PreviewCallback.java

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

app/src/main/java/com/qingdaofushan/home/zxing/decoding/CaptureActivityHandler.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/CaptureActivityHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.home.zxing.decoding;
+package com.rdgk.cemetery.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.home.R;
-import com.qingdaofushan.home.zxing.activity.CaptureActivity;
-import com.qingdaofushan.home.zxing.camera.CameraManager;
-import com.qingdaofushan.home.zxing.view.ViewfinderResultPointCallback;
+import com.rdgk.cemetery.R;
+import com.rdgk.cemetery.zxing.activity.CaptureActivity;
+import com.rdgk.cemetery.zxing.camera.CameraManager;
+import com.rdgk.cemetery.zxing.view.ViewfinderResultPointCallback;
 
 import java.util.Vector;
 

app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeFormatManager.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/DecodeFormatManager.java

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

app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeHandler.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/DecodeHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.home.zxing.decoding;
+package com.rdgk.cemetery.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.home.R;
-import com.qingdaofushan.home.zxing.activity.CaptureActivity;
-import com.qingdaofushan.home.zxing.camera.CameraManager;
-import com.qingdaofushan.home.zxing.camera.PlanarYUVLuminanceSource;
+import com.rdgk.cemetery.R;
+import com.rdgk.cemetery.zxing.activity.CaptureActivity;
+import com.rdgk.cemetery.zxing.camera.CameraManager;
+import com.rdgk.cemetery.zxing.camera.PlanarYUVLuminanceSource;
 
 import java.util.Hashtable;
 

app/src/main/java/com/qingdaofushan/home/zxing/decoding/DecodeThread.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/DecodeThread.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.home.zxing.decoding;
+package com.rdgk.cemetery.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.home.zxing.activity.CaptureActivity;
+import com.rdgk.cemetery.zxing.activity.CaptureActivity;
 
 import java.util.Hashtable;
 import java.util.Vector;

app/src/main/java/com/qingdaofushan/home/zxing/decoding/FinishListener.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/FinishListener.java

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

app/src/main/java/com/qingdaofushan/home/zxing/decoding/InactivityTimer.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/InactivityTimer.java

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

app/src/main/java/com/qingdaofushan/home/zxing/decoding/Intents.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/Intents.java

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

app/src/main/java/com/qingdaofushan/home/zxing/decoding/RGBLuminanceSource.java → app/src/main/java/com/rdgk/cemetery/zxing/decoding/RGBLuminanceSource.java

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

app/src/main/java/com/qingdaofushan/home/zxing/encoding/EncodingHandler.java → app/src/main/java/com/rdgk/cemetery/zxing/encoding/EncodingHandler.java

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

app/src/main/java/com/qingdaofushan/home/zxing/view/Constant.java → app/src/main/java/com/rdgk/cemetery/zxing/view/Constant.java

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

app/src/main/java/com/qingdaofushan/home/zxing/view/UriUtil.java → app/src/main/java/com/rdgk/cemetery/zxing/view/UriUtil.java

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

app/src/main/java/com/qingdaofushan/home/zxing/view/ViewfinderResultPointCallback.java → app/src/main/java/com/rdgk/cemetery/zxing/view/ViewfinderResultPointCallback.java

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

app/src/main/java/com/qingdaofushan/home/zxing/view/ViewfinderView.java → app/src/main/java/com/rdgk/cemetery/zxing/view/ViewfinderView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qingdaofushan.home.zxing.view;
+package com.rdgk.cemetery.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.home.R;
-import com.qingdaofushan.home.zxing.camera.CameraManager;
+import com.rdgk.cemetery.R;
+import com.rdgk.cemetery.zxing.camera.CameraManager;
 
 import java.util.Collection;
 import java.util.HashSet;

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

@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_margin="@dimen/dp_10"
-        android:text="http://debug.qingdaofushan.com/friday/fsmobile/#/main"
+        android:text="https://fny.qingdaofushan.com:6443/"
         android:visibility="gone" />
 
     <TextView

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

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

app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">床头护理平台</string>
-    <string name="FILE_PROVIDER">com.qingdaofushan.home.fileprovider</string>
+    <string name="app_name">福宁园管理系统</string>
+    <string name="FILE_PROVIDER">com.rdgk.cemetery.fileprovider</string>
 </resources>

settings.gradle

@@ -13,6 +13,6 @@ dependencyResolutionManagement {
         maven { url 'https://jitpack.io' }
     }
 }
-rootProject.name = "HomeCareSAS"
+rootProject.name = "NewFny"
 include ':app'
 include ':VideoCall'