From 5520267b7ae9599113c62ddfcf954f0b170e62fd Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 14:50:35 +0800
Subject: [PATCH]
---
/dev/null | 17 -----------------
VisitFace/DemoForBsk/app/src/main/cpp/test.cpp | 0
VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml | 8 ++++----
VisitFace/DemoForBsk/app/src/main/res/layout/tel_phone_right.xml | 4 ++--
VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml | 4 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/activity_main.xml | 2 +-
6 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/androidTest/java/com/bsk/zhangbo/demoforbsk/ExampleInstrumentedTest.java b/VisitFace/DemoForBsk/app/src/androidTest/java/com/bsk/zhangbo/demoforbsk/ExampleInstrumentedTest.java
deleted file mode 100644
index f2fd321..0000000
--- a/VisitFace/DemoForBsk/app/src/androidTest/java/com/bsk/zhangbo/demoforbsk/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.bsk.zhangbo.demoforbsk;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() throws Exception {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("com.bsk.zhangbo.demoforbsk", appContext.getPackageName());
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
index aed1623..850f987 100644
--- a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
+++ b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
@@ -9,14 +9,14 @@
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<application
- android:name=".base.BaseApplication"
+ android:name="cn.com.basic.face.base.BaseApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
- android:name=".ui.activity.MainActivity"
+ android:name="cn.com.basic.face.base.MainActivity"
android:screenOrientation="landscape"
android:windowSoftInputMode="adjustPan">
<intent-filter>
diff --git a/VisitFace/DemoForBsk/app/src/main/cpp/test.cpp b/VisitFace/DemoForBsk/app/src/main/cpp/test.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/cpp/test.cpp
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main.xml
index 80a6fc8..fa0e64a 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
- tools:context="com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity">
+ tools:context="com.bsk.zhangbo.demoforbsk.cn.com.basic.face.android.ui.MainActivity">
<!--app:tabMaxWidth="@dimen/view_size_58" 璁剧疆tab鐨勫ぇ灏�-->
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/tel_phone_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/tel_phone_right.xml
index 882a961..12ee99c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/tel_phone_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/tel_phone_right.xml
@@ -3,11 +3,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <com.bsk.zhangbo.demoforbsk.widget.VisitorView
+ <cn.com.basic.face.widget.VisitorView
android:id="@+id/tel_phone_to"
android:layout_width="254dp"
android:layout_height="350dp"
android:background="@drawable/card_bcg"
android:layout_centerInParent="true"
- android:orientation="vertical"></com.bsk.zhangbo.demoforbsk.widget.VisitorView>
+ android:orientation="vertical"></cn.com.basic.face.widget.VisitorView>
</RelativeLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
index 30c481a..aecce9b 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
@@ -67,20 +67,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
- <com.bsk.zhangbo.demoforbsk.widget.VisitorView
+ <cn.com.basic.face.widget.VisitorView
android:id="@+id/visitor_view_left"
android:layout_width="254dp"
android:layout_height="350dp"
android:background="@drawable/card_bcg"
- android:orientation="vertical"></com.bsk.zhangbo.demoforbsk.widget.VisitorView>
+ android:orientation="vertical"></cn.com.basic.face.widget.VisitorView>
- <com.bsk.zhangbo.demoforbsk.widget.VisitorView
+ <cn.com.basic.face.widget.VisitorView
android:id="@+id/visitor_view_right"
android:layout_width="254dp"
android:layout_height="350dp"
android:background="@drawable/card_bcg"
android:layout_marginLeft="103dp"
- android:orientation="vertical"></com.bsk.zhangbo.demoforbsk.widget.VisitorView>
+ android:orientation="vertical"></cn.com.basic.face.widget.VisitorView>
</LinearLayout>
<LinearLayout
android:layout_width="611dp"
diff --git a/VisitFace/DemoForBsk/app/src/test/java/com/bsk/zhangbo/demoforbsk/ExampleUnitTest.java b/VisitFace/DemoForBsk/app/src/test/java/com/bsk/zhangbo/demoforbsk/ExampleUnitTest.java
deleted file mode 100644
index 2c183c2..0000000
--- a/VisitFace/DemoForBsk/app/src/test/java/com/bsk/zhangbo/demoforbsk/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.bsk.zhangbo.demoforbsk;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() throws Exception {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
--
Gitblit v1.8.0