diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8e4e89f..7d4d10a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,9 @@ + package="com.huaan.icare.family" + android:versionCode="1" + android:versionName="1.0.0" > + + android:value="WNPbvTn1q0fS1q6VNAvo6eo7" /> diff --git a/res/drawable-hdpi/home_actionbar_bgd.png b/res/drawable-hdpi/home_actionbar_bgd.png index a8b2f5c..a23234a 100644 Binary files a/res/drawable-hdpi/home_actionbar_bgd.png and b/res/drawable-hdpi/home_actionbar_bgd.png differ diff --git a/res/drawable-hdpi/home_devices_not_location.png b/res/drawable-hdpi/home_devices_not_location.png index 7b63a1a..9c130de 100644 Binary files a/res/drawable-hdpi/home_devices_not_location.png and b/res/drawable-hdpi/home_devices_not_location.png differ diff --git a/res/drawable-hdpi/home_fuwu_yuyue.png b/res/drawable-hdpi/home_fuwu_yuyue.png index 1282a74..e1756a7 100644 Binary files a/res/drawable-hdpi/home_fuwu_yuyue.png and b/res/drawable-hdpi/home_fuwu_yuyue.png differ diff --git a/res/drawable-hdpi/home_man_dianhua.png b/res/drawable-hdpi/home_man_dianhua.png index bc2992f..f579d12 100644 Binary files a/res/drawable-hdpi/home_man_dianhua.png and b/res/drawable-hdpi/home_man_dianhua.png differ diff --git a/res/drawable-hdpi/home_man_dizhi.png b/res/drawable-hdpi/home_man_dizhi.png index 1bd195e..9c72c2a 100644 Binary files a/res/drawable-hdpi/home_man_dizhi.png and b/res/drawable-hdpi/home_man_dizhi.png differ diff --git a/res/drawable-hdpi/home_rufu_xunshi.png b/res/drawable-hdpi/home_rufu_xunshi.png index 6b7a541..18f662d 100644 Binary files a/res/drawable-hdpi/home_rufu_xunshi.png and b/res/drawable-hdpi/home_rufu_xunshi.png differ diff --git a/res/drawable-hdpi/home_weizhi_huwei.png b/res/drawable-hdpi/home_weizhi_huwei.png index 89dbd0e..a268eaa 100644 Binary files a/res/drawable-hdpi/home_weizhi_huwei.png and b/res/drawable-hdpi/home_weizhi_huwei.png differ diff --git a/res/drawable-hdpi/home_wode_dingdian.png b/res/drawable-hdpi/home_wode_dingdian.png index 8d88a4d..b94bb4d 100644 Binary files a/res/drawable-hdpi/home_wode_dingdian.png and b/res/drawable-hdpi/home_wode_dingdian.png differ diff --git a/res/drawable-hdpi/ruhu_dianhua_call.png b/res/drawable-hdpi/ruhu_dianhua_call.png index 7d55467..11116ac 100644 Binary files a/res/drawable-hdpi/ruhu_dianhua_call.png and b/res/drawable-hdpi/ruhu_dianhua_call.png differ diff --git a/res/drawable-hdpi/ruhu_tijiao_btn_normal.png b/res/drawable-hdpi/ruhu_tijiao_btn_normal.png index a4d4b6c..531f84b 100644 Binary files a/res/drawable-hdpi/ruhu_tijiao_btn_normal.png and b/res/drawable-hdpi/ruhu_tijiao_btn_normal.png differ diff --git a/res/drawable-hdpi/ruhu_tijiao_btn_press.png b/res/drawable-hdpi/ruhu_tijiao_btn_press.png index 91f9948..53c91a9 100644 Binary files a/res/drawable-hdpi/ruhu_tijiao_btn_press.png and b/res/drawable-hdpi/ruhu_tijiao_btn_press.png differ diff --git a/res/drawable-hdpi/xsy_loading.png b/res/drawable-hdpi/xsy_loading.png index f5252e0..7461bca 100644 Binary files a/res/drawable-hdpi/xsy_loading.png and b/res/drawable-hdpi/xsy_loading.png differ diff --git a/res/layout/activity_ruhuxunshi.xml b/res/layout/activity_ruhuxunshi.xml index 34f867b..c0c8a63 100644 --- a/res/layout/activity_ruhuxunshi.xml +++ b/res/layout/activity_ruhuxunshi.xml @@ -111,6 +111,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_gravity="bottom" + android:visibility="gone" android:orientation="horizontal"> #ff444444 #fff5f5f5 -#ff12b1c2 +#ffed8659 + #0079FF + diff --git a/res/values/strings.xml b/res/values/strings.xml index 0eb3747..dd9b875 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,7 +1,9 @@ - 零距离-巡视员版 + + 零距离-家人版 + 再按一次退出 @@ -55,7 +57,7 @@ 输入旧密码 输入新密码 - 巡视员 + 家人 密码 diff --git a/src/com/mapgoo/zero/api/GlobalNetErrorHandler.java b/src/com/mapgoo/zero/api/GlobalNetErrorHandler.java index cacd8b0..c51434b 100644 --- a/src/com/mapgoo/zero/api/GlobalNetErrorHandler.java +++ b/src/com/mapgoo/zero/api/GlobalNetErrorHandler.java @@ -19,9 +19,9 @@ import com.android.volley.ServerError; import com.android.volley.TimeoutError; import com.android.volley.VolleyError; -import com.huaan.icare.xsy.R; import com.j256.ormlite.dao.Dao; import com.mapgoo.zero.MGApp; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient.onReqStartListener; import com.mapgoo.zero.bean.User; import com.mapgoo.zero.bean.XsyUser; diff --git a/src/com/mapgoo/zero/api/URLs.java b/src/com/mapgoo/zero/api/URLs.java index cb1129e..8046290 100644 --- a/src/com/mapgoo/zero/api/URLs.java +++ b/src/com/mapgoo/zero/api/URLs.java @@ -13,7 +13,8 @@ public class URLs implements Serializable { private static final long serialVersionUID = -3371739479972951686L; //升级参数 - public final static String UPDATE_CODE = "0406027"; + public final static String UPDATE_CODE = "0408027"; + // 公网/生产服务器 private final static String SERVER_PRODUCT = "app001.u12580.com"; @@ -48,7 +49,8 @@ public class URLs implements Serializable { private final static String URL_SPLITTER = "/"; - public final static String PRODUCT_NAME = "patrol"; + + public final static String PRODUCT_NAME = "family"; public final static String API = "api"; public final static String PRODUCT_API_PATH = PRODUCT_NAME + URL_SPLITTER + API; diff --git a/src/com/mapgoo/zero/api/VersionUpdate.java b/src/com/mapgoo/zero/api/VersionUpdate.java index 1e377cd..6c45f0c 100644 --- a/src/com/mapgoo/zero/api/VersionUpdate.java +++ b/src/com/mapgoo/zero/api/VersionUpdate.java @@ -26,7 +26,7 @@ import org.json.JSONTokener; import com.j256.ormlite.stmt.query.In; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import android.app.AlertDialog; import android.app.ProgressDialog; diff --git a/src/com/mapgoo/zero/recevier/LockScreenReceiver.java b/src/com/mapgoo/zero/recevier/LockScreenReceiver.java index 5779f02..8ed6a64 100644 --- a/src/com/mapgoo/zero/recevier/LockScreenReceiver.java +++ b/src/com/mapgoo/zero/recevier/LockScreenReceiver.java @@ -10,7 +10,7 @@ import android.content.Intent; import android.util.Log; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.LockPatternActivity; import com.mapgoo.zero.utils.LockPatternPref; import com.mapgoo.zero.utils.StringUtils; diff --git a/src/com/mapgoo/zero/service/LocalService.java b/src/com/mapgoo/zero/service/LocalService.java index 2a4d560..5770f09 100644 --- a/src/com/mapgoo/zero/service/LocalService.java +++ b/src/com/mapgoo/zero/service/LocalService.java @@ -19,7 +19,7 @@ import com.baidu.location.LocationClientOption; import com.baidu.mapapi.map.MyLocationData; import com.baidu.mapapi.model.LatLng; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.RequestUtils; @@ -73,7 +73,7 @@ public void onReceiveLocation(BDLocation location) { mMyLoactionChange.onMyLoactionChange(location); } mLastBDLocation = location; - Updatelocation(location); + //Updatelocation(location); } public void onReceivePoi(BDLocation poiLocation) {} } diff --git a/src/com/mapgoo/zero/service/Network.java b/src/com/mapgoo/zero/service/Network.java index 52d85db..1e389e5 100644 --- a/src/com/mapgoo/zero/service/Network.java +++ b/src/com/mapgoo/zero/service/Network.java @@ -44,7 +44,7 @@ import android.util.Log; import com.baidu.location.BDLocation; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.PositionUtil; import com.mapgoo.zero.api.PositionUtil.Gps; import com.mapgoo.zero.ui.widget.QuickShPref; diff --git a/src/com/mapgoo/zero/ui/BaseActivity.java b/src/com/mapgoo/zero/ui/BaseActivity.java index 26fa441..71e8cbf 100644 --- a/src/com/mapgoo/zero/ui/BaseActivity.java +++ b/src/com/mapgoo/zero/ui/BaseActivity.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.RequestUtils; import com.mapgoo.zero.bean.MGObject; import com.mapgoo.zero.bean.User; diff --git a/src/com/mapgoo/zero/ui/BaseFragment.java b/src/com/mapgoo/zero/ui/BaseFragment.java index 212ae6e..fd68817 100644 --- a/src/com/mapgoo/zero/ui/BaseFragment.java +++ b/src/com/mapgoo/zero/ui/BaseFragment.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.MGObject; import com.mapgoo.zero.bean.User; import com.mapgoo.zero.ui.widget.MyToast; diff --git a/src/com/mapgoo/zero/ui/ConvenientServiceActivity.java b/src/com/mapgoo/zero/ui/ConvenientServiceActivity.java index 2c9f404..f6465c1 100644 --- a/src/com/mapgoo/zero/ui/ConvenientServiceActivity.java +++ b/src/com/mapgoo/zero/ui/ConvenientServiceActivity.java @@ -18,7 +18,7 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.GridView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.InternalApp; import com.mapgoo.zero.ui.widget.CommonAdapter; import com.mapgoo.zero.ui.widget.ViewHolder; diff --git a/src/com/mapgoo/zero/ui/DianpuActivity.java b/src/com/mapgoo/zero/ui/DianpuActivity.java index 48017ae..e7c0b3a 100644 --- a/src/com/mapgoo/zero/ui/DianpuActivity.java +++ b/src/com/mapgoo/zero/ui/DianpuActivity.java @@ -22,8 +22,8 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; +import com.huaan.icare.family.R; import com.android.volley.toolbox.ImageLoader; -import com.huaan.icare.xsy.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.MyVolley; diff --git a/src/com/mapgoo/zero/ui/GuideActivity.java b/src/com/mapgoo/zero/ui/GuideActivity.java index 329112e..8d4fc0e 100644 --- a/src/com/mapgoo/zero/ui/GuideActivity.java +++ b/src/com/mapgoo/zero/ui/GuideActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.MGObject; import com.mapgoo.zero.bean.User; import com.mapgoo.zero.ui.widget.MyToast; diff --git a/src/com/mapgoo/zero/ui/LaorenActivity.java b/src/com/mapgoo/zero/ui/LaorenActivity.java index 8ce5abc..a18a3f3 100644 --- a/src/com/mapgoo/zero/ui/LaorenActivity.java +++ b/src/com/mapgoo/zero/ui/LaorenActivity.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; import com.android.volley.toolbox.ImageLoader; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.MyVolley; diff --git a/src/com/mapgoo/zero/ui/LoactionActivity.java b/src/com/mapgoo/zero/ui/LoactionActivity.java index 6001d16..581f1d5 100644 --- a/src/com/mapgoo/zero/ui/LoactionActivity.java +++ b/src/com/mapgoo/zero/ui/LoactionActivity.java @@ -62,9 +62,9 @@ import com.baidu.mapapi.map.OverlayOptions; import com.baidu.mapapi.map.MyLocationConfiguration.LocationMode; import com.baidu.mapapi.model.LatLng; +import com.huaan.icare.family.R; import com.baidu.mapapi.utils.CoordinateConverter; import com.baidu.mapapi.utils.CoordinateConverter.CoordType; -import com.huaan.icare.xsy.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/LockPatternActivity.java b/src/com/mapgoo/zero/ui/LockPatternActivity.java index a56367f..29d06cc 100644 --- a/src/com/mapgoo/zero/ui/LockPatternActivity.java +++ b/src/com/mapgoo/zero/ui/LockPatternActivity.java @@ -14,7 +14,7 @@ import android.view.animation.LayoutAnimationController; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.widget.LockPatternView; import com.mapgoo.zero.ui.widget.SimpleDialogBuilder; import com.mapgoo.zero.ui.widget.LockPatternView.Cell; diff --git a/src/com/mapgoo/zero/ui/LockPatternSetupActivity.java b/src/com/mapgoo/zero/ui/LockPatternSetupActivity.java index 053c328..d0eb15e 100644 --- a/src/com/mapgoo/zero/ui/LockPatternSetupActivity.java +++ b/src/com/mapgoo/zero/ui/LockPatternSetupActivity.java @@ -11,7 +11,7 @@ import android.view.animation.AnimationUtils; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.widget.LockPatternView; import com.mapgoo.zero.ui.widget.PatternIndicatorView; import com.mapgoo.zero.ui.widget.LockPatternView.Cell; diff --git a/src/com/mapgoo/zero/ui/LoginActivity.java b/src/com/mapgoo/zero/ui/LoginActivity.java index 3417836..da3f96c 100644 --- a/src/com/mapgoo/zero/ui/LoginActivity.java +++ b/src/com/mapgoo/zero/ui/LoginActivity.java @@ -31,7 +31,7 @@ import com.android.volley.VolleyError; import com.j256.ormlite.dao.Dao; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.ApiClient.onReqStartListener; import com.mapgoo.zero.api.GlobalNetErrorHandler; diff --git a/src/com/mapgoo/zero/ui/MainActivity.java b/src/com/mapgoo/zero/ui/MainActivity.java index c1d41cf..16737b7 100644 --- a/src/com/mapgoo/zero/ui/MainActivity.java +++ b/src/com/mapgoo/zero/ui/MainActivity.java @@ -50,7 +50,7 @@ import com.android.volley.VolleyError; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnClosedListener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.MGApp; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/MessageReadActivity.java b/src/com/mapgoo/zero/ui/MessageReadActivity.java index 7ccddb9..41cb8dc 100644 --- a/src/com/mapgoo/zero/ui/MessageReadActivity.java +++ b/src/com/mapgoo/zero/ui/MessageReadActivity.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/ModifyPassWordActivity.java b/src/com/mapgoo/zero/ui/ModifyPassWordActivity.java index 30bce8c..b970f34 100644 --- a/src/com/mapgoo/zero/ui/ModifyPassWordActivity.java +++ b/src/com/mapgoo/zero/ui/ModifyPassWordActivity.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/MsgNotifierSettingsActivity.java b/src/com/mapgoo/zero/ui/MsgNotifierSettingsActivity.java index 816f487..765463b 100644 --- a/src/com/mapgoo/zero/ui/MsgNotifierSettingsActivity.java +++ b/src/com/mapgoo/zero/ui/MsgNotifierSettingsActivity.java @@ -1,6 +1,6 @@ package com.mapgoo.zero.ui; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import android.os.Bundle; import android.view.View; diff --git a/src/com/mapgoo/zero/ui/My4SStoreActivity.java b/src/com/mapgoo/zero/ui/My4SStoreActivity.java index 656142e..2631042 100644 --- a/src/com/mapgoo/zero/ui/My4SStoreActivity.java +++ b/src/com/mapgoo/zero/ui/My4SStoreActivity.java @@ -18,7 +18,7 @@ import android.widget.GridView; import android.widget.ImageView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.InternalApp; import com.mapgoo.zero.ui.widget.AutoScrollViewPager; import com.mapgoo.zero.ui.widget.CirclePageIndicator; diff --git a/src/com/mapgoo/zero/ui/OfflineMapActivity.java b/src/com/mapgoo/zero/ui/OfflineMapActivity.java index f7e6f39..29fd1ef 100644 --- a/src/com/mapgoo/zero/ui/OfflineMapActivity.java +++ b/src/com/mapgoo/zero/ui/OfflineMapActivity.java @@ -39,7 +39,7 @@ import com.baidu.mapapi.map.offline.MKOLUpdateElement; import com.baidu.mapapi.map.offline.MKOfflineMap; import com.baidu.mapapi.map.offline.MKOfflineMapListener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /* import com.baidu.mapapi.BMapManager; import com.baidu.mapapi.map.MKOLSearchRecord; diff --git a/src/com/mapgoo/zero/ui/OrderCreateActivity.java b/src/com/mapgoo/zero/ui/OrderCreateActivity.java index 37be6e6..6e399d4 100644 --- a/src/com/mapgoo/zero/ui/OrderCreateActivity.java +++ b/src/com/mapgoo/zero/ui/OrderCreateActivity.java @@ -33,7 +33,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; import com.j256.ormlite.stmt.query.In; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/OrderformDetailActivity.java b/src/com/mapgoo/zero/ui/OrderformDetailActivity.java index b32a19b..06101b3 100644 --- a/src/com/mapgoo/zero/ui/OrderformDetailActivity.java +++ b/src/com/mapgoo/zero/ui/OrderformDetailActivity.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/PackageSelectActivity.java b/src/com/mapgoo/zero/ui/PackageSelectActivity.java index e6619c1..50392a4 100644 --- a/src/com/mapgoo/zero/ui/PackageSelectActivity.java +++ b/src/com/mapgoo/zero/ui/PackageSelectActivity.java @@ -10,7 +10,7 @@ import android.widget.CheckBox; import android.widget.ListView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.Package; import com.mapgoo.zero.ui.widget.CommonAdapter; import com.mapgoo.zero.ui.widget.ViewHolder; diff --git a/src/com/mapgoo/zero/ui/PaymentsSelectActivity.java b/src/com/mapgoo/zero/ui/PaymentsSelectActivity.java index b59bbf2..f1d3315 100644 --- a/src/com/mapgoo/zero/ui/PaymentsSelectActivity.java +++ b/src/com/mapgoo/zero/ui/PaymentsSelectActivity.java @@ -3,7 +3,7 @@ import android.os.Bundle; import android.view.View; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 订单信息/订单确认/支付方式选择 diff --git a/src/com/mapgoo/zero/ui/PhotoSelectActivity.java b/src/com/mapgoo/zero/ui/PhotoSelectActivity.java index 7fd6b3b..9e0366b 100644 --- a/src/com/mapgoo/zero/ui/PhotoSelectActivity.java +++ b/src/com/mapgoo/zero/ui/PhotoSelectActivity.java @@ -25,7 +25,7 @@ import android.widget.ImageView; import android.widget.Toast; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.widget.CommonAdapter; import com.mapgoo.zero.ui.widget.NativeImageLoader; import com.mapgoo.zero.ui.widget.NativeImageLoader.NativeImageCallBack; diff --git a/src/com/mapgoo/zero/ui/PingjiaActivity.java b/src/com/mapgoo/zero/ui/PingjiaActivity.java index 99447cd..cf3c945 100644 --- a/src/com/mapgoo/zero/ui/PingjiaActivity.java +++ b/src/com/mapgoo/zero/ui/PingjiaActivity.java @@ -11,7 +11,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/PreArrangementActivity.java b/src/com/mapgoo/zero/ui/PreArrangementActivity.java index edb7753..e991600 100644 --- a/src/com/mapgoo/zero/ui/PreArrangementActivity.java +++ b/src/com/mapgoo/zero/ui/PreArrangementActivity.java @@ -6,7 +6,7 @@ import android.view.View; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.utils.StringUtils; /** diff --git a/src/com/mapgoo/zero/ui/PreArrangementDetailActivity.java b/src/com/mapgoo/zero/ui/PreArrangementDetailActivity.java index ea58ae9..0f1a622 100644 --- a/src/com/mapgoo/zero/ui/PreArrangementDetailActivity.java +++ b/src/com/mapgoo/zero/ui/PreArrangementDetailActivity.java @@ -6,7 +6,7 @@ import android.support.v7.widget.CardView; import android.view.View; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.PreArrangementRecord; /** diff --git a/src/com/mapgoo/zero/ui/PreArrangementsRecordsActivity.java b/src/com/mapgoo/zero/ui/PreArrangementsRecordsActivity.java index 3b98890..11c8081 100644 --- a/src/com/mapgoo/zero/ui/PreArrangementsRecordsActivity.java +++ b/src/com/mapgoo/zero/ui/PreArrangementsRecordsActivity.java @@ -14,7 +14,7 @@ import android.widget.ListView; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.PreArrangementRecord; import com.mapgoo.zero.bean.ViolationRecord; import com.mapgoo.zero.ui.widget.CommonAdapter; diff --git a/src/com/mapgoo/zero/ui/RechargeCenterActivity.java b/src/com/mapgoo/zero/ui/RechargeCenterActivity.java index 0861ef9..b064eca 100644 --- a/src/com/mapgoo/zero/ui/RechargeCenterActivity.java +++ b/src/com/mapgoo/zero/ui/RechargeCenterActivity.java @@ -10,7 +10,7 @@ import android.widget.CheckBox; import android.widget.ListView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.CarObject; import com.mapgoo.zero.ui.widget.CommonAdapter; import com.mapgoo.zero.ui.widget.ViewHolder; diff --git a/src/com/mapgoo/zero/ui/RegisterActivity.java b/src/com/mapgoo/zero/ui/RegisterActivity.java index 03ef4e7..065f46e 100644 --- a/src/com/mapgoo/zero/ui/RegisterActivity.java +++ b/src/com/mapgoo/zero/ui/RegisterActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.MGObject; import com.mapgoo.zero.bean.User; import com.mapgoo.zero.ui.widget.MyToast; diff --git a/src/com/mapgoo/zero/ui/RightDialogActivity.java b/src/com/mapgoo/zero/ui/RightDialogActivity.java index 1be0fc1..d1a7da9 100644 --- a/src/com/mapgoo/zero/ui/RightDialogActivity.java +++ b/src/com/mapgoo/zero/ui/RightDialogActivity.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/RufuxunshiActivity.java b/src/com/mapgoo/zero/ui/RufuxunshiActivity.java index 67de11d..764f6f1 100644 --- a/src/com/mapgoo/zero/ui/RufuxunshiActivity.java +++ b/src/com/mapgoo/zero/ui/RufuxunshiActivity.java @@ -31,7 +31,7 @@ import com.android.volley.Response.Listener; import com.android.volley.toolbox.ImageLoader; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.MyVolley; diff --git a/src/com/mapgoo/zero/ui/SettingsAboutActivity.java b/src/com/mapgoo/zero/ui/SettingsAboutActivity.java index 91b0de5..6858bce 100644 --- a/src/com/mapgoo/zero/ui/SettingsAboutActivity.java +++ b/src/com/mapgoo/zero/ui/SettingsAboutActivity.java @@ -1,7 +1,8 @@ package com.mapgoo.zero.ui; -import com.huaan.icare.xsy.R; + +import com.huaan.icare.family.R; import com.mapgoo.zero.api.URLs; import com.mapgoo.zero.api.VersionUpdate; import com.mapgoo.zero.utils.VersionUtils; diff --git a/src/com/mapgoo/zero/ui/SettingsActivity.java b/src/com/mapgoo/zero/ui/SettingsActivity.java index 4ed0fa3..4c141e7 100644 --- a/src/com/mapgoo/zero/ui/SettingsActivity.java +++ b/src/com/mapgoo/zero/ui/SettingsActivity.java @@ -4,7 +4,7 @@ import android.os.Bundle; import android.view.View; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 模版 diff --git a/src/com/mapgoo/zero/ui/ShangpinActivity.java b/src/com/mapgoo/zero/ui/ShangpinActivity.java index bb5587f..2cde397 100644 --- a/src/com/mapgoo/zero/ui/ShangpinActivity.java +++ b/src/com/mapgoo/zero/ui/ShangpinActivity.java @@ -25,8 +25,8 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; +import com.huaan.icare.family.R; import com.android.volley.toolbox.ImageLoader; -import com.huaan.icare.xsy.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.MyVolley; diff --git a/src/com/mapgoo/zero/ui/SmartHandCtrlActivity.java b/src/com/mapgoo/zero/ui/SmartHandCtrlActivity.java index 29c968b..1f036cb 100644 --- a/src/com/mapgoo/zero/ui/SmartHandCtrlActivity.java +++ b/src/com/mapgoo/zero/ui/SmartHandCtrlActivity.java @@ -5,7 +5,7 @@ import android.os.Bundle; import android.view.View; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 智能车掌控 diff --git a/src/com/mapgoo/zero/ui/SplashActivity.java b/src/com/mapgoo/zero/ui/SplashActivity.java index b4dbcaa..9808ae7 100644 --- a/src/com/mapgoo/zero/ui/SplashActivity.java +++ b/src/com/mapgoo/zero/ui/SplashActivity.java @@ -8,7 +8,7 @@ import android.view.animation.Animation.AnimationListener; import cn.jpush.android.api.JPushInterface; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 模版 diff --git a/src/com/mapgoo/zero/ui/TemplateActivity.java b/src/com/mapgoo/zero/ui/TemplateActivity.java index e958d07..84b7792 100644 --- a/src/com/mapgoo/zero/ui/TemplateActivity.java +++ b/src/com/mapgoo/zero/ui/TemplateActivity.java @@ -3,7 +3,7 @@ import android.os.Bundle; import android.view.View; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 模版 diff --git a/src/com/mapgoo/zero/ui/TemplateFragment.java b/src/com/mapgoo/zero/ui/TemplateFragment.java index de63674..a589907 100644 --- a/src/com/mapgoo/zero/ui/TemplateFragment.java +++ b/src/com/mapgoo/zero/ui/TemplateFragment.java @@ -6,7 +6,7 @@ import android.view.View; import android.view.ViewGroup; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 模版Fragment diff --git a/src/com/mapgoo/zero/ui/ViolationQueryActivity.java b/src/com/mapgoo/zero/ui/ViolationQueryActivity.java index 0658227..270ea4b 100644 --- a/src/com/mapgoo/zero/ui/ViolationQueryActivity.java +++ b/src/com/mapgoo/zero/ui/ViolationQueryActivity.java @@ -10,7 +10,7 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.CarObject; import com.mapgoo.zero.ui.widget.CommonAdapter; import com.mapgoo.zero.ui.widget.ViewHolder; diff --git a/src/com/mapgoo/zero/ui/ViolationQueryOtherActivity.java b/src/com/mapgoo/zero/ui/ViolationQueryOtherActivity.java index f3088ae..e801699 100644 --- a/src/com/mapgoo/zero/ui/ViolationQueryOtherActivity.java +++ b/src/com/mapgoo/zero/ui/ViolationQueryOtherActivity.java @@ -10,7 +10,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 违章查询-其他车辆查询 diff --git a/src/com/mapgoo/zero/ui/ViolationQueryResultActivity.java b/src/com/mapgoo/zero/ui/ViolationQueryResultActivity.java index ad454ca..61d38e3 100644 --- a/src/com/mapgoo/zero/ui/ViolationQueryResultActivity.java +++ b/src/com/mapgoo/zero/ui/ViolationQueryResultActivity.java @@ -9,7 +9,7 @@ import android.view.View.OnClickListener; import android.widget.ListView; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.bean.CarObject; import com.mapgoo.zero.bean.ViolationRecord; import com.mapgoo.zero.ui.widget.CommonAdapter; diff --git a/src/com/mapgoo/zero/ui/WebActivity.java b/src/com/mapgoo/zero/ui/WebActivity.java index 0147bad..a8f0ea4 100644 --- a/src/com/mapgoo/zero/ui/WebActivity.java +++ b/src/com/mapgoo/zero/ui/WebActivity.java @@ -14,7 +14,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshWebView; import com.handmark.pulltorefresh.library.extras.PullToRefreshWebView2; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.widget.SimpleDialogBuilder; /** diff --git a/src/com/mapgoo/zero/ui/WodedingdanActivity.java b/src/com/mapgoo/zero/ui/WodedingdanActivity.java index d695236..236c5bf 100644 --- a/src/com/mapgoo/zero/ui/WodedingdanActivity.java +++ b/src/com/mapgoo/zero/ui/WodedingdanActivity.java @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.ApiClient.onReqStartListener; diff --git a/src/com/mapgoo/zero/ui/XiaoxiActivity.java b/src/com/mapgoo/zero/ui/XiaoxiActivity.java index cd3a464..b18efb8 100644 --- a/src/com/mapgoo/zero/ui/XiaoxiActivity.java +++ b/src/com/mapgoo/zero/ui/XiaoxiActivity.java @@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSON; import com.android.volley.Response.Listener; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.api.ApiClient; import com.mapgoo.zero.api.GlobalNetErrorHandler; import com.mapgoo.zero.api.RequestUtils; diff --git a/src/com/mapgoo/zero/ui/YuyuefuwuActivity.java b/src/com/mapgoo/zero/ui/YuyuefuwuActivity.java index 0529c56..dd1e944 100644 --- a/src/com/mapgoo/zero/ui/YuyuefuwuActivity.java +++ b/src/com/mapgoo/zero/ui/YuyuefuwuActivity.java @@ -4,7 +4,7 @@ import android.os.Bundle; import android.view.View; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 模版 diff --git a/src/com/mapgoo/zero/ui/widget/CircleImageView.java b/src/com/mapgoo/zero/ui/widget/CircleImageView.java index c414248..920a5d0 100644 --- a/src/com/mapgoo/zero/ui/widget/CircleImageView.java +++ b/src/com/mapgoo/zero/ui/widget/CircleImageView.java @@ -17,7 +17,7 @@ import android.util.AttributeSet; import android.widget.ImageView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class CircleImageView extends ImageView { diff --git a/src/com/mapgoo/zero/ui/widget/CirclePageIndicator.java b/src/com/mapgoo/zero/ui/widget/CirclePageIndicator.java index b456f77..7a53b89 100644 --- a/src/com/mapgoo/zero/ui/widget/CirclePageIndicator.java +++ b/src/com/mapgoo/zero/ui/widget/CirclePageIndicator.java @@ -20,7 +20,7 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import android.content.Context; import android.content.res.Resources; diff --git a/src/com/mapgoo/zero/ui/widget/EditTextView.java b/src/com/mapgoo/zero/ui/widget/EditTextView.java index 6bafc10..785b42a 100644 --- a/src/com/mapgoo/zero/ui/widget/EditTextView.java +++ b/src/com/mapgoo/zero/ui/widget/EditTextView.java @@ -9,7 +9,7 @@ import android.view.View; import android.widget.EditText; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class EditTextView extends EditText implements TextWatcher, View.OnFocusChangeListener { diff --git a/src/com/mapgoo/zero/ui/widget/LockPatternView.java b/src/com/mapgoo/zero/ui/widget/LockPatternView.java index ea18682..bee10e0 100644 --- a/src/com/mapgoo/zero/ui/widget/LockPatternView.java +++ b/src/com/mapgoo/zero/ui/widget/LockPatternView.java @@ -40,7 +40,7 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; //import com.google.android.collect.Lists; /** diff --git a/src/com/mapgoo/zero/ui/widget/MGProgressDialog.java b/src/com/mapgoo/zero/ui/widget/MGProgressDialog.java index 978e805..ff0d2fa 100644 --- a/src/com/mapgoo/zero/ui/widget/MGProgressDialog.java +++ b/src/com/mapgoo/zero/ui/widget/MGProgressDialog.java @@ -9,7 +9,7 @@ import android.widget.ImageView; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述: 自定义Dialog diff --git a/src/com/mapgoo/zero/ui/widget/MyToast.java b/src/com/mapgoo/zero/ui/widget/MyToast.java index de65f72..36b552c 100644 --- a/src/com/mapgoo/zero/ui/widget/MyToast.java +++ b/src/com/mapgoo/zero/ui/widget/MyToast.java @@ -7,7 +7,7 @@ import android.widget.TextView; import android.widget.Toast; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** * 概述：封装的 自定义风格的Toast 工具类 diff --git a/src/com/mapgoo/zero/ui/widget/NumberCtrlView.java b/src/com/mapgoo/zero/ui/widget/NumberCtrlView.java index 8d5931e..adfcfd1 100644 --- a/src/com/mapgoo/zero/ui/widget/NumberCtrlView.java +++ b/src/com/mapgoo/zero/ui/widget/NumberCtrlView.java @@ -1,6 +1,6 @@ package com.mapgoo.zero.ui.widget; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import android.content.Context; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/mapgoo/zero/ui/widget/PatternIndicatorView.java b/src/com/mapgoo/zero/ui/widget/PatternIndicatorView.java index b666911..b51467f 100644 --- a/src/com/mapgoo/zero/ui/widget/PatternIndicatorView.java +++ b/src/com/mapgoo/zero/ui/widget/PatternIndicatorView.java @@ -6,7 +6,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class PatternIndicatorView extends LinearLayout { diff --git a/src/com/mapgoo/zero/ui/widget/PhotoSelectPop.java b/src/com/mapgoo/zero/ui/widget/PhotoSelectPop.java index dbfe443..9b91445 100644 --- a/src/com/mapgoo/zero/ui/widget/PhotoSelectPop.java +++ b/src/com/mapgoo/zero/ui/widget/PhotoSelectPop.java @@ -1,6 +1,6 @@ package com.mapgoo.zero.ui.widget; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import android.content.Context; import android.graphics.drawable.BitmapDrawable; diff --git a/src/com/mapgoo/zero/ui/widget/RippleButton.java b/src/com/mapgoo/zero/ui/widget/RippleButton.java index 4bffd6f..d53ab98 100644 --- a/src/com/mapgoo/zero/ui/widget/RippleButton.java +++ b/src/com/mapgoo/zero/ui/widget/RippleButton.java @@ -33,7 +33,7 @@ import android.view.animation.AccelerateDecelerateInterpolator; import android.widget.Button; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.nineoldandroids.view.ViewHelper; public class RippleButton extends Button { diff --git a/src/com/mapgoo/zero/ui/widget/SimpleDialogBuilder.java b/src/com/mapgoo/zero/ui/widget/SimpleDialogBuilder.java index b8a40a3..d6995a3 100644 --- a/src/com/mapgoo/zero/ui/widget/SimpleDialogBuilder.java +++ b/src/com/mapgoo/zero/ui/widget/SimpleDialogBuilder.java @@ -10,7 +10,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.utils.StringUtils; public class SimpleDialogBuilder { diff --git a/src/com/mapgoo/zero/ui/widget/SwitchButton.java b/src/com/mapgoo/zero/ui/widget/SwitchButton.java index 8f9ab50..987e851 100644 --- a/src/com/mapgoo/zero/ui/widget/SwitchButton.java +++ b/src/com/mapgoo/zero/ui/widget/SwitchButton.java @@ -11,7 +11,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; /** diff --git a/src/com/mapgoo/zero/ui/widget/TintableImageButton.java b/src/com/mapgoo/zero/ui/widget/TintableImageButton.java index a495a26..0b0a07f 100644 --- a/src/com/mapgoo/zero/ui/widget/TintableImageButton.java +++ b/src/com/mapgoo/zero/ui/widget/TintableImageButton.java @@ -9,7 +9,7 @@ import android.view.MotionEvent; import android.widget.ImageButton; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class TintableImageButton extends ImageButton { private int tintUpdateDelay_; diff --git a/src/com/mapgoo/zero/utils/DateUtils.java b/src/com/mapgoo/zero/utils/DateUtils.java index fb359d2..861bab8 100644 --- a/src/com/mapgoo/zero/utils/DateUtils.java +++ b/src/com/mapgoo/zero/utils/DateUtils.java @@ -7,7 +7,7 @@ import android.annotation.SuppressLint; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class DateUtils { diff --git a/src/com/mapgoo/zero/utils/DoubleClickExitHelper.java b/src/com/mapgoo/zero/utils/DoubleClickExitHelper.java index a5cf429..0c7b2ca 100644 --- a/src/com/mapgoo/zero/utils/DoubleClickExitHelper.java +++ b/src/com/mapgoo/zero/utils/DoubleClickExitHelper.java @@ -5,7 +5,7 @@ import android.os.Looper; import android.view.KeyEvent; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.widget.MyToast; /** diff --git a/src/com/mapgoo/zero/utils/FragmentUtils.java b/src/com/mapgoo/zero/utils/FragmentUtils.java index ed77978..1d190f4 100644 --- a/src/com/mapgoo/zero/utils/FragmentUtils.java +++ b/src/com/mapgoo/zero/utils/FragmentUtils.java @@ -4,7 +4,7 @@ import android.app.FragmentManager; import android.app.FragmentTransaction; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class FragmentUtils { diff --git a/src/com/mapgoo/zero/utils/ImageUtils.java b/src/com/mapgoo/zero/utils/ImageUtils.java index 660fdb4..a3d0395 100644 --- a/src/com/mapgoo/zero/utils/ImageUtils.java +++ b/src/com/mapgoo/zero/utils/ImageUtils.java @@ -23,7 +23,7 @@ import android.util.Log; import android.widget.Toast; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; public class ImageUtils { diff --git a/src/com/mapgoo/zero/utils/PhoneUtils.java b/src/com/mapgoo/zero/utils/PhoneUtils.java index 9c91c17..c5098ac 100644 --- a/src/com/mapgoo/zero/utils/PhoneUtils.java +++ b/src/com/mapgoo/zero/utils/PhoneUtils.java @@ -5,7 +5,7 @@ import android.widget.EditText; import com.mapgoo.zero.MGApp; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import com.mapgoo.zero.ui.widget.MyToast; public class PhoneUtils { diff --git a/src/com/mapgoo/zero/utils/TurnToCamrea.java b/src/com/mapgoo/zero/utils/TurnToCamrea.java index c7744ee..606d34d 100644 --- a/src/com/mapgoo/zero/utils/TurnToCamrea.java +++ b/src/com/mapgoo/zero/utils/TurnToCamrea.java @@ -2,7 +2,7 @@ import java.io.File; -import com.huaan.icare.xsy.R; +import com.huaan.icare.family.R; import android.app.Activity; import android.content.Context;