xuxiuxi
2017-03-29 5520267b7ae9599113c62ddfcf954f0b170e62fd


git-svn-id: http://192.168.1.226/svn/proxy@235 454eff88-639b-444f-9e54-f578c98de674
2个文件已删除
1个文件已添加
4个文件已修改
61 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/androidTest/java/com/bsk/zhangbo/demoforbsk/ExampleInstrumentedTest.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/cpp/test.cpp 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/activity_main.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/tel_phone_right.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/test/java/com/bsk/zhangbo/demoforbsk/ExampleUnitTest.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/androidTest/java/com/bsk/zhangbo/demoforbsk/ExampleInstrumentedTest.java
File was deleted
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>
VisitFace/DemoForBsk/app/src/main/cpp/test.cpp
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的大小-->
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>
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"
VisitFace/DemoForBsk/app/src/test/java/com/bsk/zhangbo/demoforbsk/ExampleUnitTest.java
File was deleted