From 3d9d4d70a6cee29269b3cc24a50b3f1119234c7e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 15:01:46 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml | 0
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 0
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java | 4 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposePopup.java | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_visit_reason.xml | 0
5 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
index 7282216..55f9355 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -32,7 +32,7 @@
@Override
public View addLeftLayout() {
- mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.device_manager_left,null);
+ mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_left,null);
mLayoutWifi = (RelativeLayout) mViewLeft.findViewById(R.id.device_wifi);
mLayoutLandline = (RelativeLayout) mViewLeft.findViewById(R.id.device_landline);
mLayoutSchool = (RelativeLayout) mViewLeft.findViewById(R.id.device_school);
@@ -65,7 +65,7 @@
@Override
public View addRightLayout() {
- mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.device_manager_right,null);
+ mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right,null);
return mViewRight;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposePopup.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposePopup.java
index f9a1fa6..1da4d83 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposePopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposePopup.java
@@ -32,7 +32,7 @@
private Context mContext;
public VisitPurposePopup(Context context, List mList, String mTitle) {
this.mContext = context;
- view = LayoutInflater.from(context).inflate(R.layout.visit_purpose_popup,null);
+ view = LayoutInflater.from(context).inflate(R.layout.dialog_visit_reason,null);
this.mList = mList;
mTvTitle = (TextView) view.findViewById(R.id.pop_single_title);
if (mTitle !=null && mTitle.length() > 0){
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/visit_purpose_popup.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_visit_reason.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/visit_purpose_popup.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/dialog_visit_reason.xml
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/device_manager_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/device_manager_left.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/device_manager_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
similarity index 100%
rename from VisitFace/DemoForBsk/app/src/main/res/layout/device_manager_right.xml
rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
--
Gitblit v1.8.0