Browse Source

@task: relation

bai 3 years ago
parent
commit
176a1d1f00

+ 37 - 37
demo/src/main/AndroidManifest.xml

@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.sybotan.android.demo">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.sybotan.android.demo">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- SD卡中创建与删除文件权限 -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/> <!-- SD卡中创建与删除文件权限 -->
     <uses-permission
-        android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" /> <!-- 向SDCard写入数据权限 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 摄像头 -->
-    <uses-permission android:name="android.permission.CAMERA" />
+            android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+            tools:ignore="ProtectedPermissions"/> <!-- 向SDCard写入数据权限 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!-- 摄像头 -->
+    <uses-permission android:name="android.permission.CAMERA"/>
 
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-feature android:name="android.hardware.camera"/>
+    <uses-feature android:name="android.hardware.camera.autofocus"/>
 
-    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <application
-        android:name=".DemoApp"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+            android:name=".DemoApp"
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:networkSecurityConfig="@xml/network_security_config"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
+        <activity android:name=".activities.poc.RelationActivity">
+        </activity>
         <activity
-            android:name=".activities.poc.RecordInfoActivity"
-            android:exported="true" />
+                android:name=".activities.poc.RecordInfoActivity"
+                android:exported="true"/>
         <activity
-            android:name=".activities.poc.DeviceTypeActivity"
-            android:exported="true" />
+                android:name=".activities.poc.DeviceTypeActivity"
+                android:exported="true"/>
         <activity
-            android:name=".activities.poc.DeviceActivity"
-            android:exported="true">
-
+                android:name=".activities.poc.DeviceActivity"
+                android:exported="true">
         </activity>
         <activity
-            android:name=".activities.poc.SceneActivity"
-            android:exported="true" />
+                android:name=".activities.poc.SceneActivity"
+                android:exported="true"/>
         <activity
-            android:name=".activities.poc.SpaceActivity"
-            android:exported="true" />
+                android:name=".activities.poc.SpaceActivity"
+                android:exported="true"/>
         <activity android:name=".activities.MainActivity">
-
         </activity>
-        <activity android:name=".activities.GraphyActivity" />
-        <activity android:name=".activities.WebViewActivity" />
+        <activity android:name=".activities.GraphyActivity"/>
+        <activity android:name=".activities.WebViewActivity"/>
         <activity android:name=".activities.PocActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.zbar.lib.CaptureActivity" />
+        <activity android:name="com.zbar.lib.CaptureActivity"/>
     </application>
 
 </manifest>

+ 12 - 0
demo/src/main/java/com/sybotan/android/demo/activities/poc/RelationActivity.kt

@@ -0,0 +1,12 @@
+package com.sybotan.android.demo.activities.poc
+
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import com.sybotan.android.demo.R
+
+class RelationActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_relation)
+    }
+}

+ 23 - 0
demo/src/main/res/layout/activity_relation.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".activities.poc.RelationActivity">
+
+    <TextView
+            android:id="@+id/majorTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="major"
+            android:textSize="18sp"
+            android:textColor="@color/black_272727"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+    
+</android.support.constraint.ConstraintLayout>

+ 2 - 1
demo/src/main/res/values/strings.xml

@@ -28,6 +28,7 @@
     <string name="qr_name">二维码</string>
     <string name="i_know">我知道了</string>
     <string name="permission">抱歉,你的%1$s权限没有打开,无法正常服务
-        \n请点击”设置”->在应用程序中找到”popon”->权限管理->%2$s->”允许”即可 </string>
+        \n请点击”设置”->在应用程序中找到”popon”->权限管理->%2$s->”允许”即可
+    </string>
     <string name="camera">摄像头(相机)</string>
 </resources>