diff --git a/app/build.gradle b/app/build.gradle
index ac8fda5b5678050ec19f0c8b5753ef7553e55b88..cef534034a08667bc73ab89478444731809baba9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-/*plugins{
- id
-}*/
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+}
 
 /*apply from '../gradlescript/config.gradle'*/
 
@@ -46,6 +43,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "junit:junit:4.12"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     /*kotlin的协程包*/
@@ -70,6 +68,9 @@ dependencies {
     /*引入protobuf*/
     implementation 'com.google.protobuf:protoc:3.14.0'
 
+    /* 引入datastore */
+    implementation 'androidx.datastore:datastore:1.0.0-alpha05'
+
     /*数据库的greendao引入*/
     implementation 'org.greenrobot:greendao:3.3.0'
 
@@ -85,6 +86,9 @@ dependencies {
     /*Gson 引入*/
     implementation 'com.google.code.gson:gson:2.8.6'
 
+    /*引入EventBus3*/
+    implementation 'org.greenrobot:eventbus:3.1.1'
+
     kapt "com.android.databinding:compiler:4.0.2"
 
     kapt project(':apt')
diff --git a/app/src/androidTest/java/com/guiguzi/androidtest/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/guiguzi/androidtest/ExampleInstrumentedTest.kt
index d7de16cdfb46e3faa31040c18516a417110882e5..43471d25b82197b347eb0fc8d351f5780e1ee6a1 100644
--- a/app/src/androidTest/java/com/guiguzi/androidtest/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/guiguzi/androidtest/ExampleInstrumentedTest.kt
@@ -1,24 +1,23 @@
 package com.guiguzi.androidtest
 
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import com.guiguzi.androidtest.jsonUtil.JsonBean
+import com.guiguzi.androidtest.jsonUtil.JsonMain
+import com.guiguzi.androidtest.jsonUtil.MpAppBean
 import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
 
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
     @Test
     fun useAppContext() {
         // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.guiguzi.androidtest", appContext.packageName)
+    }
+
+    @Test
+    fun useJson() {
+        var mpAppBean = JsonMain.toJavaByStr(JsonBean.mpApp, MpAppBean::class.java)
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07e7e60ee2216d72114394f260f573f89f247f67..1455a2a241b59c144cc15b53ffe891139c2d9590 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,29 +27,24 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
 
-        <activity android:name="com.guiguzi.androidtest.AppMainActivity"/>
+        <activity
+            android:name="com.guiguzi.androidtest.AppMainActivity"
+            android:launchMode="singleTop" />
 
-        <activity android:name=".activity.MainActivity" >
+        <activity android:name=".activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".eventdispatch.MyActivity"
-            android:launchMode="singleTask">
-            <!--<intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>-->
-        </activity>
+            android:launchMode="singleTask" />
 
         <activity android:name=".activity.HalfActivity" />
 
-        <activity android:name=".customView.CustomActivity"/>
+        <activity android:name=".customView.CustomActivity" />
 
         <activity android:name=".activity.MediaPlayerActivity" />
 
@@ -61,6 +56,14 @@
 
         <activity android:name=".ui.PushActivity" />
 
+        <activity android:name=".activity.ButtonsActivity" />
+
+        <activity android:name=".activity.ViewPageActivity" />
+
+        <activity android:name=".activity.EventBusActivity" />
+
+        <activity android:name=".activity.LifecycleActivity" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -71,6 +74,10 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <meta-data
+            android:name="meta_data_1"
+            android:value="MetaDataTest" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/AppMainActivity.kt b/app/src/main/java/com/guiguzi/androidtest/AppMainActivity.kt
index ea6479f439cdade9f2265ddbad387e1f70055e59..7acb0f2c6107cbc02b11f783450bea3d45916c7e 100644
--- a/app/src/main/java/com/guiguzi/androidtest/AppMainActivity.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/AppMainActivity.kt
@@ -62,9 +62,19 @@ class AppMainActivity : AppCompatActivity() {
 
     }
 
+    override fun onStart() {
+        super.onStart()
+        Log.d(TAG,"AppMainActivity onStart().")
+    }
+
+    override fun onRestart() {
+        super.onRestart()
+        Log.d(TAG,"AppMainActivity onStart().")
+    }
 
     override fun onResume() {
         super.onResume()
+        Log.d(TAG,"AppMainActivity onResume().")
         mHandler.postDelayed({
             val message = Message.obtain()
             message.arg1 = 100
@@ -76,17 +86,28 @@ class AppMainActivity : AppCompatActivity() {
         }, 3 * 1000)
     }
 
+    override fun onPause() {
+        super.onPause()
+        Log.d(TAG,"AppMainActivity onPause().")
+    }
+
+    override fun onStop() {
+        super.onStop()
+        Log.d(TAG,"AppMainActivity onStop().")
+    }
+
     override fun onSaveInstanceState(outState: Bundle, outPersistentState: PersistableBundle) {
         super.onSaveInstanceState(outState, outPersistentState)
-        Log.d("GGZTest", "MainActivity onSaveInstanceState")
+        Log.d(TAG, "MainActivity onSaveInstanceState")
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
-        Log.d("GGZTest", "MainActivity onRestoreInstanceState")
+        Log.d(TAG, "MainActivity onRestoreInstanceState")
     }
 
     override fun onDestroy() {
         super.onDestroy()
+        Log.d(TAG,"AppMainActivity onDestroy().")
     }
 }
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/ButtonsActivity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/ButtonsActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..002b3530ca0557c22ea4b46b0d6affcec11a1528
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/ButtonsActivity.kt
@@ -0,0 +1,59 @@
+package com.guiguzi.androidtest.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.util.Log
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import com.guiguzi.androidtest.R
+
+class ButtonsActivity : Activity() {
+
+    companion object {
+        const val TAG = "ButtonsActivity"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(baseContext)
+        linearLayout.setBackgroundColor(resources.getColor(R.color.colorBlack))
+
+        val rootLayoutParams = FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+
+        /*linearLayout.layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.MATCH_PARENT
+        )*/
+        val matchParams = ViewGroup.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.MATCH_PARENT
+        )
+
+        val button1 = Button(baseContext)
+         val buttonParams = LinearLayout.LayoutParams(
+             LinearLayout.LayoutParams.WRAP_CONTENT,
+             LinearLayout.LayoutParams.WRAP_CONTENT
+         )
+        button1.setText("brand")
+        button1.textSize = 22f
+        button1.setTextColor(resources.getColor(R.color.colorAccent))
+        linearLayout.addView(button1, buttonParams)
+
+        setContentView(linearLayout, rootLayoutParams)
+
+        button1.setOnClickListener {
+            val brand = android.os.Build.BRAND
+            Log.d(TAG, "mobile brand = $brand")
+        }
+
+        //测试显示启动
+        val intent = Intent(this,MainActivity.javaClass)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/EventBusActivity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/EventBusActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..b47742bf59312c0ddc858419a721f0c4abde529d
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/EventBusActivity.kt
@@ -0,0 +1,65 @@
+package com.guiguzi.androidtest.activity
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import android.widget.TextView
+import com.guiguzi.androidtest.R
+import com.guiguzi.androidtest.eventbus.EventString
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+
+class EventBusActivity : Activity() {
+
+    companion object {
+        const val TAG = "EventBusTag"
+    }
+
+    lateinit var mText: TextView
+    lateinit var mButton: Button
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_event_bus)
+        initView()
+    }
+
+    fun initView() {
+        mText = findViewById(R.id.text)
+        mButton = findViewById(R.id.button_register)
+
+
+        mButton.setOnClickListener {
+            EventBus.getDefault().register(this)
+        }
+
+        findViewById<Button>(R.id.button_sticky0).setOnClickListener {
+            postEventSticky("hello eventBus,000000")
+        }
+
+        findViewById<Button>(R.id.button_sticky1).setOnClickListener {
+            postEventSticky("hello eventBus,1111111")
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        EventBus.getDefault().unregister(this)
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun changeTextEvent(event: EventString) {
+        Log.d(TAG, "get event message,event = ${event.content}")
+    }
+
+    fun register() {
+        EventBus.getDefault().register(this);
+    }
+
+    fun postEventSticky(str: String) {
+        EventBus.getDefault().postSticky(EventString(str))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/LifecycleActivity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/LifecycleActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..ba9983c3c42701bf43352839c69fba74b7f02677
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/LifecycleActivity.kt
@@ -0,0 +1,92 @@
+package com.guiguzi.androidtest.activity
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import androidx.lifecycle.*
+import com.guiguzi.androidtest.R
+
+class LifecycleActivity : Activity(), LifecycleOwner {
+
+    companion object {
+        const val TAG = "Lifecycle"
+    }
+
+    lateinit var mButton1: Button
+    lateinit var mButton2: Button
+    lateinit var mButton3: Button
+    lateinit var mButtonRegister: Button
+
+    var mLiveData: MutableLiveData<String> = MutableLiveData<String>()
+
+    var mLifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_lifecycle)
+        initView()
+        mLifecycleRegistry.currentState = Lifecycle.State.CREATED
+        mLifecycleRegistry.addObserver(object : LifecycleEventObserver {
+            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                Log.d(TAG, "onStateChanged event = ${event.name}")
+            }
+        })
+    }
+
+    fun initView() {
+        mButton1 = findViewById(R.id.button1)
+        mButton2 = findViewById(R.id.button2)
+        mButton3 = findViewById(R.id.button3)
+        mButtonRegister = findViewById(R.id.register)
+
+        /* mLiveData.observe(this,
+             Observer<String> { Log.d(TAG, "mLiveData change, value = $it") })*/
+
+        mButton1.setOnClickListener {
+            mLiveData.setValue("hello liveData! 111111")
+        }
+
+        mButton2.setOnClickListener {
+            mLiveData.value = "hello liveData! 222222"
+        }
+
+        mButton3.setOnClickListener {
+            mLiveData.value = "hello liveData! 333333"
+        }
+
+        mButtonRegister.setOnClickListener {
+            mLiveData.observe(
+                this,
+                Observer<String> { Log.d(TAG, "register live data! value = $it") })
+        }
+
+    }
+
+    override fun onStart() {
+        super.onStart()
+        //mLifecycleRegistry.currentState = Lifecycle.State.STARTED
+    }
+
+    override fun onResume() {
+        super.onResume()
+        //mLifecycleRegistry.currentState = Lifecycle.State.RESUMED
+    }
+
+    override fun onPause() {
+        super.onPause()
+    }
+
+    override fun onStop() {
+        super.onStop()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        //mLifecycleRegistry.currentState = Lifecycle.State.DESTROYED
+    }
+
+    override fun getLifecycle(): Lifecycle {
+        return mLifecycleRegistry
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/ViewPageActivity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/ViewPageActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..9534abfec4381e7cf6150816db0c49b8f682ae9b
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/ViewPageActivity.kt
@@ -0,0 +1,52 @@
+package com.guiguzi.androidtest.activity
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
+import com.guiguzi.androidtest.R
+
+class ViewPageActivity : Activity() {
+
+    lateinit var mViewPager: ViewPager
+    var mData: List<String> = listOf("000", "111", "222", "333", "444", "555")
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.layout_viewpage)
+        initView()
+    }
+
+    fun initView() {
+        mViewPager = findViewById(R.id.view_page1)
+        var myVPAdapter = MyViewPagerAdapter()
+        mViewPager.adapter = myVPAdapter
+        mViewPager.rotation = 90f
+    }
+
+    inner class MyViewPagerAdapter : PagerAdapter() {
+        override fun getCount(): Int {
+            return mData.size
+        }
+
+        override fun isViewFromObject(view: View, `object`: Any): Boolean {
+            return view === `object`
+        }
+
+        override fun instantiateItem(container: ViewGroup, position: Int): Any {
+            var view: View = View.inflate(baseContext, R.layout.item_page1, null)
+            view.rotation = -90f
+            var text_view: TextView = view.findViewById(R.id.page_text)
+            text_view.text = mData[position]
+            container.addView(view)
+            return view
+        }
+
+        override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+            container.removeView(`object` as View)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/customView/CircleView.kt b/app/src/main/java/com/guiguzi/androidtest/customView/CircleView.kt
new file mode 100644
index 0000000000000000000000000000000000000000..2cce27bb4fc5248060cc3784068513330a986ab2
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/customView/CircleView.kt
@@ -0,0 +1,50 @@
+package com.guiguzi.androidtest.customView
+
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+import androidx.annotation.ColorInt
+
+class CircleView : View {
+
+    var mPaint: Paint = Paint()
+
+    @ColorInt
+    var mColor: Int = Color.RED
+
+    constructor(context: Context) : super(context) {
+
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+
+    }
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+        mPaint = Paint()
+        mPaint.color = mColor
+        mPaint.style = Paint.Style.FILL_AND_STROKE
+
+        val ovalPath = Path()
+        val rect = RectF(50f, 50f, 200f, 500f)
+        ovalPath.addOval(rect, Path.Direction.CCW)
+        val rgn = Region()
+        rgn.setPath(ovalPath, Region(50, 50, 200, 200))
+        drawRegion(canvas, rgn, mPaint)
+    }
+
+    private fun drawRegion(canvas: Canvas?, rgn: Region, paint: Paint) {
+        val iter = RegionIterator(rgn)
+        val rect = Rect()
+        while (iter.next(rect)) {
+            canvas?.drawRect(rect, paint)
+        }
+    }
+
+    fun setColor(@ColorInt color: Int) {
+        mColor = color
+        invalidate()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/customView/CustomActivity.kt b/app/src/main/java/com/guiguzi/androidtest/customView/CustomActivity.kt
index 0a062bf99876d7822182cc4557394d8df17c160a..e73e3cd50cf3bf0e9111972b5c32390c7f6b6521 100644
--- a/app/src/main/java/com/guiguzi/androidtest/customView/CustomActivity.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/customView/CustomActivity.kt
@@ -2,11 +2,18 @@ package com.guiguzi.androidtest.customView
 
 import android.app.Activity
 import android.os.Bundle
+import android.util.Log
+import android.util.SparseArray
 import android.widget.Button
+import androidx.datastore.createDataStore
 import com.guiguzi.androidtest.R
 
 class CustomActivity : Activity() {
 
+    companion object {
+        const val TAG = "CustomActivity"
+    }
+
     lateinit var mRefreshView: RefreshViewAnimation
     lateinit var mStartButton: Button
     lateinit var mSetColor: Button
@@ -27,8 +34,23 @@ class CustomActivity : Activity() {
 
         mSetColor.setOnClickListener {
             mRefreshView.isStop = true
-        }
 
+            val sparse = SparseArray<String>();
+            sparse.put(1, "111")
+            sparse.put(2, "222")
+            sparse.put(5, "333")
+            sparse.put(4, "444")
+
+            val index1 = sparse.indexOfValue("111")
+            val index2 = sparse.indexOfValue("222")
+            val index3 = sparse.indexOfValue("333")
+            val index4 = sparse.indexOfValue("444")
+
+            Log.d(TAG, "index1 = ${index1}, index2 =  $index2; index3 = $index3; index4 = $index4")
+        }
     }
 
+    private fun initDataStore(){
+        /*val dataStore = baseContext.createDataStore(name = "setting")*/
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/customView/CustomViewGroup.kt b/app/src/main/java/com/guiguzi/androidtest/customView/CustomViewGroup.kt
index 0ff90ecf9dbbc7b56465aacf813eea6bff2a3012..9628418838f62625f381f9870b95d02df2d132b3 100644
--- a/app/src/main/java/com/guiguzi/androidtest/customView/CustomViewGroup.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/customView/CustomViewGroup.kt
@@ -9,6 +9,10 @@ import com.guiguzi.androidtest.R
 
 class CustomViewGroup : ViewGroup {
 
+    companion object {
+        const val TAG = "CustomViewGroup"
+    }
+
     private var mSelfWight: Int = 0
     private var mSelfHeight: Int = 0
 
@@ -17,9 +21,9 @@ class CustomViewGroup : ViewGroup {
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         val typeArray = context.obtainStyledAttributes(attrs, R.styleable.custom)
-        mSelfWight = typeArray.getInt(R.styleable.custom_mWidth,0)
-        mSelfHeight = typeArray.getInt(R.styleable.custom_mHeight,0)
-        Log.d("ggz","CustomViewGroup(),mSelfWight = $mSelfWight, mSelfHeight = $mSelfHeight")
+        mSelfWight = typeArray.getInt(R.styleable.custom_mWidth, 0)
+        mSelfHeight = typeArray.getInt(R.styleable.custom_mHeight, 0)
+        Log.d(TAG, "CustomViewGroup(),mSelfWight = $mSelfWight, mSelfHeight = $mSelfHeight")
     }
 
     constructor(context: Context, attrs: AttributeSet? = null, str: Int) : super(
@@ -30,23 +34,28 @@ class CustomViewGroup : ViewGroup {
 
     }
 
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-        val count = childCount
-        var currentHeight = 0
-        for (i in 0 until count) {
-            val view: View = getChildAt(i)
-            val height: Int = view.getMeasuredHeight()
-            val width: Int = view.getMeasuredWidth()
-            view.layout(l, currentHeight, l + width, currentHeight + height)
-            currentHeight += height
-        }
-    }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         measureChildren(widthMeasureSpec, heightMeasureSpec)
         val widthMode = MeasureSpec.getMode(widthMeasureSpec)
         val width = MeasureSpec.getSize(widthMeasureSpec)
+
+        val selfId = if (this.id == R.id.out) {
+            "out"
+        } else {
+            "inner"
+        }
+
+        val modeType: String = if (widthMode == MeasureSpec.AT_MOST) {
+            "at_most"
+        } else if (widthMode == MeasureSpec.EXACTLY) {
+            "exactly"
+        } else {
+            "unspecified"
+        }
+
+        Log.d(TAG, "onMeasure(), id = ${selfId}; widthMode = ${modeType}; width = ${width}")
         val heightMode = MeasureSpec.getMode(heightMeasureSpec)
         val height = MeasureSpec.getSize(heightMeasureSpec)
         if (widthMode == MeasureSpec.AT_MOST && heightMode == MeasureSpec.AT_MOST) {
@@ -60,6 +69,18 @@ class CustomViewGroup : ViewGroup {
         }
     }
 
+    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+        val count = childCount
+        var currentHeight = 0
+        for (i in 0 until count) {
+            val view: View = getChildAt(i)
+            val height: Int = view.measuredHeight
+            val width: Int = view.measuredWidth
+            view.layout(l, currentHeight, l + width, currentHeight + height)
+            currentHeight += height
+        }
+    }
+
     private fun getMaxWidth(): Int {
         val count = childCount
         var maxWidth = 0
diff --git a/app/src/main/java/com/guiguzi/androidtest/customView/PointView.kt b/app/src/main/java/com/guiguzi/androidtest/customView/PointView.kt
index 5f371acc2bda8653399c1a815627da10dc4841c1..2e32bf2b018967688b59e827c9d5448115471ce0 100644
--- a/app/src/main/java/com/guiguzi/androidtest/customView/PointView.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/customView/PointView.kt
@@ -1,12 +1,9 @@
 package com.guiguzi.androidtest.customView
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
-import android.os.Handler
-import android.os.Message
 import android.util.AttributeSet
 import android.view.View
 import androidx.annotation.ColorInt
diff --git a/app/src/main/java/com/guiguzi/androidtest/customView/RefreshViewAnimation.kt b/app/src/main/java/com/guiguzi/androidtest/customView/RefreshViewAnimation.kt
index ee885da712938d62940d82808aee82d532607d30..86fb0a403399db9b52fc7b8a7a64ae5cea827e0a 100644
--- a/app/src/main/java/com/guiguzi/androidtest/customView/RefreshViewAnimation.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/customView/RefreshViewAnimation.kt
@@ -10,7 +10,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.LinearLayout
-import androidx.annotation.ColorInt
 import com.guiguzi.androidtest.R
 
 class RefreshViewAnimation : LinearLayout {
@@ -34,7 +33,6 @@ class RefreshViewAnimation : LinearLayout {
     var isStop = false
 
     var mRunnable = Runnable {
-
         val message = Message.obtain()
         message.what = REFRESH
         mHandler.sendMessage(message)
diff --git a/app/src/main/java/com/guiguzi/androidtest/eventbus/EventString.kt b/app/src/main/java/com/guiguzi/androidtest/eventbus/EventString.kt
new file mode 100644
index 0000000000000000000000000000000000000000..18a9f307e9985f9581a6e927b1de4b87a5f43013
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/eventbus/EventString.kt
@@ -0,0 +1,9 @@
+package com.guiguzi.androidtest.eventbus
+
+class EventString {
+    var content: String? = null
+
+    constructor(str: String?) {
+        content = str
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyActivity.kt b/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyActivity.kt
index b8ed103cf698eddf0ddb7fa7b4af3530e89f063e..3a16a2fe99003404a45d0b1639c7cc40c02c6bb6 100644
--- a/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyActivity.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyActivity.kt
@@ -20,14 +20,14 @@ import android.widget.TextView
 import android.widget.Toast
 import com.guiguzi.androidtest.AppMainActivity
 import com.guiguzi.androidtest.R
+import com.guiguzi.androidtest.utils.AppInfoUtils
 import com.guiguzi.androidtest.utils.ClipboardUtil
 import com.guiguzi.androidtest.utils.TimeUtils
 
-
 class MyActivity : Activity() {
 
     companion object {
-        const val TAG = "GGZTest"
+        const val TAG = "ggz_view"
     }
 
     lateinit var mRootView: ViewGroup
@@ -88,9 +88,9 @@ class MyActivity : Activity() {
         myView.setBackgroundColor(getColor(R.color.colorPrimary))
 
         val button1 = Button(baseContext)
-        button1.setText("移动1")
+        button1.text = "移动1"
         val button2 = Button(baseContext)
-        button2.setText("移动2")
+        button2.text = "移动2"
         val layoutParams = LinearLayout.LayoutParams(
             LinearLayout.LayoutParams.WRAP_CONTENT,
             LinearLayout.LayoutParams.WRAP_CONTENT
@@ -123,7 +123,6 @@ class MyActivity : Activity() {
 
         /*showDialog()*/
 
-
         mRootView.viewTreeObserver.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
             override fun onGlobalLayout() {
@@ -139,14 +138,14 @@ class MyActivity : Activity() {
         }
 
         button2.setOnClickListener {
-            mRootView.scrollBy(-10, -10)
+            button2.scrollBy(-10, -10)
             val thread = Thread {
                 Looper.prepare()
                 val handler = Handler()
 
                 Looper.loop();
                 handler.looper.quit();
-                handler.looper.isCurrentThread()
+                handler.looper.isCurrentThread
             }
         }
 
@@ -159,7 +158,10 @@ class MyActivity : Activity() {
 
     override fun onStart() {
         super.onStart()
-        Log.d(TAG, "onStart")
+
+        val metaData = AppInfoUtils.getMetaData(baseContext, "meta_data_1")
+
+        Log.d(TAG, "onStart(). metaData = $metaData")
     }
 
     override fun onRestart() {
diff --git a/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyView.kt b/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyView.kt
index 1de8c82c2d86443ed0694375ddc179a81b6b2a5d..09ef2f78c8d5346232edebc66890cfbdf56e13d3 100644
--- a/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyView.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyView.kt
@@ -10,7 +10,7 @@ import android.widget.TextView
 class MyView(context: Context) : View(context) {
 
     companion object{
-        const val TAG = "ggz"
+        const val TAG = "ggz_view"
     }
 
     constructor(context: Context, attrs: AttributeSet? = null) : this(context) {
diff --git a/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyViewGroup.kt b/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyViewGroup.kt
index 3d81bb04c057a7ca856ce0842c1dd329d3f6ccc1..1dfcfaf4db4f7c4e7066a94806785b4ad1ef26ab 100644
--- a/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyViewGroup.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/eventdispatch/MyViewGroup.kt
@@ -9,7 +9,7 @@ import android.view.ViewGroup
 
 class MyViewGroup(context: Context) : ViewGroup(context) {
     companion object {
-        const val TAG = "ggz"
+        const val TAG = "ggz_view"
     }
 
     constructor(context: Context, attrs: AttributeSet? = null) : this(context) {
@@ -18,7 +18,6 @@ class MyViewGroup(context: Context) : ViewGroup(context) {
 
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
         Log.d(MyView.TAG, "MyViewGroup dispatchTouchEvent MotionEvent.action = ${ev?.action}")
-
         return super.dispatchTouchEvent(ev)
     }
 
@@ -34,7 +33,7 @@ class MyViewGroup(context: Context) : ViewGroup(context) {
 
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
 
-        Log.d("GGZTest","start start left = $l ; top = $t; right = $t; bottom = $b")
+        Log.d("GGZTest", "start start left = $l ; top = $t; right = $t; bottom = $b")
 
         var totalHeight = 0
         for (i in 0..childCount) {
@@ -44,22 +43,25 @@ class MyViewGroup(context: Context) : ViewGroup(context) {
             var oldTotalHeight = totalHeight
             totalHeight += height
             setChildFrame(view, 0, oldTotalHeight, width, totalHeight)
-            Log.d("GGZTest","width = $width ; height = $height; oldTotalHeight = $oldTotalHeight; totalHeight = $totalHeight")
+            Log.d(
+                "GGZTest",
+                "width = $width ; height = $height; oldTotalHeight = $oldTotalHeight; totalHeight = $totalHeight"
+            )
         }
-        Log.d("GGZTest","last last left = $l ; top = $t; right = $t; bottom = $b")
+        Log.d("GGZTest", "last last left = $l ; top = $t; right = $t; bottom = $b")
     }
 
     override fun onWindowVisibilityChanged(visibility: Int) {
         super.onWindowVisibilityChanged(visibility)
         when (visibility) {
             View.VISIBLE -> {
-                Log.d("GGZTest", "visibility")
+                Log.d(TAG, "visibility")
             }
             View.GONE -> {
-                Log.d("GGZTest", "gone")
+                Log.d(TAG, "gone")
             }
             View.INVISIBLE -> {
-                Log.d("GGZTest", "invisible")
+                Log.d(TAG, "invisible")
             }
         }
 
diff --git a/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt b/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt
index ce0e7dbe23d4ae626ac440b8af01c498d02c0115..f1ace95ee4aef53c2cbb489c81b99366bbd10373 100644
--- a/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt
@@ -2,14 +2,17 @@ package com.guiguzi.androidtest.fragments
 
 import android.content.Context
 import android.os.Bundle
+import android.provider.MediaStore
+import android.telephony.TelephonyManager
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
+import androidx.annotation.NonNull
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.guiguzi.androidtest.R
@@ -21,6 +24,10 @@ class HomeChannelFragment : Fragment {
     lateinit var mRootView: View
     lateinit var mSwipeRefresh: SwipeRefreshLayout
     lateinit var mHomeRV: RecyclerView
+
+    lateinit var snapHelper: PagerSnapHelper
+    var mLastPosition: Int = -1
+
     var isFirstLoad = true
     var title: String = ""
 
@@ -73,9 +80,12 @@ class HomeChannelFragment : Fragment {
         dataList.add("四大组件生命周期学习")
         dataList.add("音视频学习")
         dataList.add("push学习")
+        dataList.add("buttons")
+        dataList.add("pager")
+        dataList.add("EventBus")
+        dataList.add("Lifecycle")
 
-
-        val gridLayoutManager = LinearLayoutManager(context)
+        val gridLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         mHomeRV.layoutManager = gridLayoutManager
         mHomeRV.addItemDecoration(
             DividerItemDecoration(
@@ -84,6 +94,29 @@ class HomeChannelFragment : Fragment {
             )
         )
         mHomeRV.adapter = MyAdapter(context, dataList)
+        snapHelper = PagerSnapHelper()
+//        snapHelper.attachToRecyclerView(mHomeRV)
+        mHomeRV.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(@NonNull recyclerView: RecyclerView, newState: Int) {
+                super.onScrollStateChanged(recyclerView, newState)
+                val view = snapHelper.findSnapView(gridLayoutManager) ?: return
+                val position: Int = gridLayoutManager.getPosition(view)
+                if (mLastPosition == position) {
+                    return
+                }
+                mLastPosition = position
+
+                /*previewFragment.setSelectedPosition(-1)
+                tvNumber.setText(
+                    getString(
+                        R.string.__picker_preview_current_number_easy_photos,
+                        mLastPosition + 1, dataList.size
+                    )
+                )
+                toggleSelector()*/
+            }
+        })
+
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -138,4 +171,9 @@ class HomeChannelFragment : Fragment {
     fun lazyLoad() {
 
     }
+
+    fun test() {
+        var a = TelephonyManager.NETWORK_TYPE_NR
+        var b = MediaStore.Images.Media.RELATIVE_PATH
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/jsonUtil/JsonBean.kt b/app/src/main/java/com/guiguzi/androidtest/jsonUtil/JsonBean.kt
new file mode 100644
index 0000000000000000000000000000000000000000..36e87e0b8c61af22a665b513838cb958fe584e98
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/jsonUtil/JsonBean.kt
@@ -0,0 +1,10 @@
+package com.guiguzi.androidtest.jsonUtil
+
+object JsonBean {
+    val mpApp: String = "{\n" +
+            "\\\"appDesc\\\":\\\"应用01-1\\\",\n" +
+            "\\\"appIconUrl\\\":\\\"http: \\/\\/128.196.189.28: 9180\\/jsap_service\\/findFiles\\/0d771265d560b46e956c3934f352014a.jpg\\\",\n" +
+            "\\\"appId\\\":\\\"4e030783-2d03-403b-a31c-7b8075b665e3\\\",\n" +
+            "\\\"appName\\\":\\\"应用01-1\\\"\n" +
+            "}"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/jsonUtil/JsonMain.kt b/app/src/main/java/com/guiguzi/androidtest/jsonUtil/JsonMain.kt
new file mode 100644
index 0000000000000000000000000000000000000000..d073d29e7ff9818104ffcb1f9fa0fd794ccfe476
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/jsonUtil/JsonMain.kt
@@ -0,0 +1,16 @@
+package com.guiguzi.androidtest.jsonUtil
+
+import com.google.gson.Gson
+import org.json.JSONObject
+
+object JsonMain {
+    fun <T> toJavaByStr(jsonStr: String, clazz: Class<T>): T {
+        var gson = Gson()
+        return gson.fromJson<T>(jsonStr, clazz)
+    }
+
+    fun <T> toJava(json: JSONObject, clazz: Class<T>): T {
+        var gson = Gson()
+        return gson.fromJson<T>(json.toString(), clazz)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/jsonUtil/MpAppBean.kt b/app/src/main/java/com/guiguzi/androidtest/jsonUtil/MpAppBean.kt
new file mode 100644
index 0000000000000000000000000000000000000000..795b08c272c0c867a516f5c328a95c5e9a737441
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/jsonUtil/MpAppBean.kt
@@ -0,0 +1,8 @@
+package com.guiguzi.androidtest.jsonUtil
+
+class MpAppBean {
+    var appDesc: String = ""
+    var appIconUrl: String = ""
+    var appId: String = ""
+    var appName: String = ""
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/lifecycle/ReadMe.md b/app/src/main/java/com/guiguzi/androidtest/lifecycle/ReadMe.md
new file mode 100644
index 0000000000000000000000000000000000000000..02f1f729fc8bfa982d63f8d235cca55862ef233a
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/lifecycle/ReadMe.md
@@ -0,0 +1 @@
+# 测试support26后添加的android.arch.lifecycle包
diff --git a/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java b/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
index 60d7419d6740bfce2fcfee053b2acd69d5a4210b..b7da609d57e54b2f1459152cc04578fc782c1304 100644
--- a/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
+++ b/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
@@ -10,12 +10,18 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.guiguzi.androidtest.R;
+import com.guiguzi.androidtest.activity.ButtonsActivity;
+import com.guiguzi.androidtest.activity.EventBusActivity;
+import com.guiguzi.androidtest.activity.LifecycleActivity;
 import com.guiguzi.androidtest.activity.MediaPlayerActivity;
 import com.guiguzi.androidtest.activity.MainActivity;
+import com.guiguzi.androidtest.activity.ViewPageActivity;
 import com.guiguzi.androidtest.customView.CustomActivity;
 import com.guiguzi.androidtest.eventdispatch.MyActivity;
 import com.guiguzi.androidtest.h5.H5Activity;
@@ -24,6 +30,10 @@ import com.guiguzi.androidtest.rxJavaTest.RxJavaActivity;
 
 import java.util.List;
 
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static androidx.annotation.RestrictTo.Scope.SUBCLASSES;
+
 public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyViewHolder> {
 
     public Context mContext;
@@ -41,7 +51,8 @@ public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyViewHolder> {
     @NonNull
     @Override
     public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.layout_item, parent, false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.layout_channel_item, parent,
+                false);
         return new MyViewHolder(view);
     }
 
@@ -172,6 +183,64 @@ public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyViewHolder> {
                     }
                 });
                 break;
+            case "buttons":
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent();
+                        if (mContext instanceof Activity) {
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        }
+                        ComponentName componentName = new ComponentName(mContext, ButtonsActivity.class);
+                        intent.setComponent(componentName);
+                        mContext.startActivity(intent);
+                    }
+                });
+                break;
+
+            case "pager":
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent();
+                        if (mContext instanceof Activity) {
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        }
+                        ComponentName componentName = new ComponentName(mContext, ViewPageActivity.class);
+                        intent.setComponent(componentName);
+                        mContext.startActivity(intent);
+                    }
+                });
+                break;
+
+            case "EventBus":
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent();
+                        if (mContext instanceof Activity) {
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        }
+                        ComponentName componentName = new ComponentName(mContext, EventBusActivity.class);
+                        intent.setComponent(componentName);
+                        mContext.startActivity(intent);
+                    }
+                });
+                break;
+            case "Lifecycle":
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent();
+                        if (mContext instanceof Activity) {
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        }
+                        ComponentName componentName = new ComponentName(mContext, LifecycleActivity.class);
+                        intent.setComponent(componentName);
+                        mContext.startActivity(intent);
+                    }
+                });
+                break;
         }
     }
 
@@ -188,6 +257,10 @@ public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyViewHolder> {
         return 0;
     }
 
+    @RestrictTo({LIBRARY, LIBRARY_GROUP, SUBCLASSES})
+    void setPrimaryColors(@ColorInt int... colors) {
+    }
+
     static class MyViewHolder extends RecyclerView.ViewHolder {
 
         TextView textView;
diff --git a/app/src/main/java/com/guiguzi/androidtest/utils/AppInfoUtils.kt b/app/src/main/java/com/guiguzi/androidtest/utils/AppInfoUtils.kt
new file mode 100644
index 0000000000000000000000000000000000000000..90b9954a5941b742a2bfe49c1324d5c89f79ef57
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/utils/AppInfoUtils.kt
@@ -0,0 +1,28 @@
+package com.guiguzi.androidtest.utils
+
+import android.content.Context
+import android.content.pm.PackageManager
+import java.lang.Exception
+
+object AppInfoUtils {
+
+    fun getMetaData(context: Context, metaKey: String): String {
+        var result = ""
+        try {
+            val applicationInfo = context.packageManager.getApplicationInfo(
+                context.packageName,
+                PackageManager.GET_META_DATA
+            )
+
+            if (applicationInfo?.metaData != null) {
+                result = applicationInfo.metaData.get(metaKey) as String
+            }
+
+        } catch (e: Exception) {
+
+        }
+
+        return result
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/utils/TestUtils.java b/app/src/main/java/com/guiguzi/androidtest/utils/TestUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8efed8529b5437542d3282b9601a7eb0e580295
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/utils/TestUtils.java
@@ -0,0 +1,12 @@
+package com.guiguzi.androidtest.utils;
+
+import android.content.Context;
+import android.os.Build;
+import android.telephony.TelephonyManager;
+
+public class TestUtils {
+
+    public void test(Context context) {
+    }
+
+}
diff --git a/app/src/main/res/layout/activity_custom.xml b/app/src/main/res/layout/activity_custom.xml
index 43fda3c130c2e6d6d27a10ef2103d7c1090ef62e..f84dfb788c47efbb78292ac2c3954e5981a2eb5f 100644
--- a/app/src/main/res/layout/activity_custom.xml
+++ b/app/src/main/res/layout/activity_custom.xml
@@ -14,40 +14,58 @@
         android:id="@+id/start_animation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="开始动画"/>
+        android:text="开始动画" />
 
     <Button
         android:id="@+id/set_color"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="改变颜色"/>
+        android:text="改变颜色" />
 
     <com.guiguzi.androidtest.customView.CustomViewGroup
-        android:layout_width="match_parent"
+        android:id="@+id/out"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:mHeight="20"
+        android:background="@color/color_grey"
+        app:mHeight="40"
         app:mWidth="10">
 
-        <TextView
+        <com.guiguzi.androidtest.customView.CustomViewGroup
+            android:id="@+id/inner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="hello world!1111"
-            android:textSize="25dp" />
+            android:background="@color/colorBlack"
+            app:mHeight="40"
+            app:mWidth="10">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="hello world!1111"
+                android:textColor="@color/colorWhite"
+                android:textSize="25dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="hello world!2222"
+                android:textColor="@color/colorWhite"
+                android:textSize="25dp" />
+
+            <com.guiguzi.androidtest.customView.CircleView
+                android:layout_width="100dp"
+                android:layout_height="100dp"/>
+        </com.guiguzi.androidtest.customView.CustomViewGroup>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="hello world!2222"
-            android:textSize="25dp" />
     </com.guiguzi.androidtest.customView.CustomViewGroup>
 
     <com.guiguzi.androidtest.customView.BrokenLineView
         android:id="@+id/line"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_event_bus.xml b/app/src/main/res/layout/activity_event_bus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83ceabffa1f1c6e3f3d7ba384dda0490a0afc640
--- /dev/null
+++ b/app/src/main/res/layout/activity_event_bus.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="no message"
+        android:textColor="@color/colorAccent"
+        android:textSize="24sp" />
+
+    <Button
+        android:id="@+id/button_register"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="注册" />
+
+    <Button
+        android:id="@+id/button_sticky0"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="Sticky事件0" />
+
+    <Button
+        android:id="@+id/button_sticky1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="Sticky事件1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_lifecycle.xml b/app/src/main/res/layout/activity_lifecycle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5d5bfbda739585685b8f1de1aae81b53946c3309
--- /dev/null
+++ b/app/src/main/res/layout/activity_lifecycle.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="按钮1" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="按钮2" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="按钮3" />
+
+    <Button
+        android:id="@+id/register"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="Register" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_page1.xml b/app/src/main/res/layout/item_page1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af68ed8eec089456f12ca26b87df04ccdf9f2b34
--- /dev/null
+++ b/app/src/main/res/layout/item_page1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/page_text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textColor="@color/colorAccent"
+        android:textSize="26dp"
+        tools:text="hello world" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_channel_item.xml b/app/src/main/res/layout/layout_channel_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a2ca0062d400a8eb17ad2c1f1cb75070317698e7
--- /dev/null
+++ b/app/src/main/res/layout/layout_channel_item.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorWhite"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="6dp"
+        android:gravity="center"
+        android:textColor="@color/colorAccent"
+        android:textSize="22dp"
+        tools:text="@string/hello_world" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_viewpage.xml b/app/src/main/res/layout/layout_viewpage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..73236f3fd11d149d7f82c87425b5a0748c4a464b
--- /dev/null
+++ b/app/src/main/res/layout/layout_viewpage.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="hello world"
+        android:textColor="@color/colorAccent"
+        android:textSize="24dp" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_page1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a40738d9d56ddca6d26f3006a8cd95d828c1eb0..0df8dcd4415231e4d70ab9b28ecbc471b93b95c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">安卓测试</string>
     <string name="hello_world">hello world</string>
+
+    <string name="__picker_preview_current_number_easy_photos">%1$d/%2$d</string>
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 23339e0df69d1fe76df74d7cc6c861fced84e98c..4a8b06b44947164089e29020d1685cc3ac57948a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+#android.useDeprecatedNdk=true
diff --git a/network/build.gradle b/network/build.gradle
index e67632830182c5634ee6bcdcdf53afedc4ac5194..5b690494d4ef666b1b728acf23184e37dc6f53f7 100644
--- a/network/build.gradle
+++ b/network/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/pushbase/jiguangpush/build.gradle b/pushbase/jiguangpush/build.gradle
index 0d02e8533a5cfb9bab9a23b0014acf0731f2a24a..a8e50862d954fb87b48c9f0799367a29d2d852d3 100644
--- a/pushbase/jiguangpush/build.gradle
+++ b/pushbase/jiguangpush/build.gradle
@@ -1,6 +1,11 @@
-apply plugin: 'com.android.library'
+/*apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android-extensions'*/
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 android {
     compileSdkVersion 30
@@ -16,9 +21,9 @@ android {
         consumerProguardFiles "consumer-rules.pro"
 
         manifestPlaceholders = [
-                JPUSH_PKGNAME :  "com.guiguzi.androidtest",
-                JPUSH_APPKEY  :  "5447bc19bd0fab957bf17d66",//值来自开发者平台取得的AppKey
-                JPUSH_CHANNEL :  "default_developer",
+                JPUSH_PKGNAME: "com.guiguzi.androidtest",
+                JPUSH_APPKEY : "5447bc19bd0fab957bf17d66", //值来自开发者平台取得的AppKey
+                JPUSH_CHANNEL: "default_developer",
         ]
     }
 
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangApplication.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangApplication.java
index 87edbd6de3c66af30dc208e84c653bcc32e86b4b..8d5a5ab38d4e03ae229cf0c3bd664e459be440ee 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangApplication.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangApplication.java
@@ -10,11 +10,11 @@ import cn.jpush.android.api.JPushInterface;
  * 一般建议在自定义 Application 类里初始化。也可以在主 Activity 里。
  */
 public class JiGuangApplication extends Application {
-    private static final String TAG = "JIGUANG-Example";
+    public static final String TAG = "wzq_push_jg";
 
     @Override
     public void onCreate() {
-        Logger.d(TAG, "[ExampleApplication] onCreate");
+        Logger.d(TAG, "[JiGuangApplication] onCreate");
         super.onCreate();
 
         JPushInterface.setDebugMode(true);            // 设置开启日志,发布时请关闭日志
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMainActivity.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMainActivity.java
index dfb3208a22597aa3dcdb4f640e2a7f11bfec8256..3e1bc4b83b77e392bac1223da41f5397cf8f2296 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMainActivity.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMainActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -13,12 +14,12 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.wzq.jiguangpush.R;
-
 import cn.jpush.android.api.JPushInterface;
 
 public class JiGuangPushMainActivity extends Activity implements OnClickListener {
 
+    private final static String TAG = JiGuangApplication.TAG;
+
     private Button mInit;
     private Button mSetting;
     private Button mStopPush;
@@ -32,14 +33,14 @@ public class JiGuangPushMainActivity extends Activity implements OnClickListener
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
+        setContentView(R.layout.jiguang_main);
         initView();
         registerMessageReceiver();  // used for receive msg
     }
 
     private void initView() {
         TextView mImei = (TextView) findViewById(R.id.tv_imei);
-        String udid = ExampleUtil.getImei(getApplicationContext(), "");
+        String udid = ExampleUtil.getImei(getApplicationContext(), "null");
         if (null != udid) mImei.setText("IMEI: " + udid);
 
         TextView mAppKey = (TextView) findViewById(R.id.tv_appkey);
@@ -95,8 +96,10 @@ public class JiGuangPushMainActivity extends Activity implements OnClickListener
             JPushInterface.resumePush(getApplicationContext());
         } else if (viewId == R.id.getRegistrationId) {
             String rid = JPushInterface.getRegistrationID(getApplicationContext());
+            Log.d(TAG, "rid = " + rid);
             if (!rid.isEmpty()) {
                 mRegId.setText("RegId:" + rid);
+                Toast.makeText(this, "rid = " + rid, Toast.LENGTH_LONG);
             } else {
                 Toast.makeText(this, "Get registration fail, JPush init failed!", Toast.LENGTH_SHORT).show();
             }
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMessageReceiver.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMessageReceiver.java
index 9e01a37b3b8b397605878174b98dbadc05fdc3f6..2cfffb4f495d151ecfc21f73dcb0db846371a8c7 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMessageReceiver.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/JiGuangPushMessageReceiver.java
@@ -16,27 +16,28 @@ import cn.jpush.android.api.NotificationMessage;
 import cn.jpush.android.service.JPushMessageReceiver;
 
 public class JiGuangPushMessageReceiver extends JPushMessageReceiver {
-    private static final String TAG = "JiGuangPushMessageReceiver";
+    private static final String TAG = JiGuangApplication.TAG;
+
     @Override
     public void onMessage(Context context, CustomMessage customMessage) {
-        Log.e(TAG,"[onMessage] "+customMessage);
-        processCustomMessage(context,customMessage);
+        Log.e(TAG, "[onMessage] " + customMessage);
+        processCustomMessage(context, customMessage);
     }
 
     @Override
     public void onNotifyMessageOpened(Context context, NotificationMessage message) {
-        Log.e(TAG,"[onNotifyMessageOpened] "+message);
-        try{
+        Log.e(TAG, "[onNotifyMessageOpened] " + message);
+        try {
             //打开自定义的Activity
             Intent i = new Intent(context, TestActivity.class);
             Bundle bundle = new Bundle();
-            bundle.putString(JPushInterface.EXTRA_NOTIFICATION_TITLE,message.notificationTitle);
-            bundle.putString(JPushInterface.EXTRA_ALERT,message.notificationContent);
+            bundle.putString(JPushInterface.EXTRA_NOTIFICATION_TITLE, message.notificationTitle);
+            bundle.putString(JPushInterface.EXTRA_ALERT, message.notificationContent);
             i.putExtras(bundle);
             //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP );
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             context.startActivity(i);
-        }catch (Throwable throwable){
+        } catch (Throwable throwable) {
 
         }
     }
@@ -47,8 +48,8 @@ public class JiGuangPushMessageReceiver extends JPushMessageReceiver {
         String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
 
         //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
-        if(nActionExtra==null){
-            Log.d(TAG,"ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
+        if (nActionExtra == null) {
+            Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
             return;
         }
         if (nActionExtra.equals("my_extra1")) {
@@ -64,48 +65,50 @@ public class JiGuangPushMessageReceiver extends JPushMessageReceiver {
 
     @Override
     public void onNotifyMessageArrived(Context context, NotificationMessage message) {
-        Log.e(TAG,"[onNotifyMessageArrived] "+message);
+        Log.e(TAG, "[onNotifyMessageArrived] " + message.toString());
     }
 
     @Override
     public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
-        Log.e(TAG,"[onNotifyMessageDismiss] "+message);
+        Log.e(TAG, "[onNotifyMessageDismiss] " + message.toString());
     }
 
     @Override
     public void onRegister(Context context, String registrationId) {
-        Log.e(TAG,"[onRegister] "+registrationId);
+        Log.e(TAG, "[onRegister] " + registrationId);
     }
 
     @Override
     public void onConnected(Context context, boolean isConnected) {
-        Log.e(TAG,"[onConnected] "+isConnected);
+        Log.e(TAG, "[onConnected] " + isConnected);
     }
 
     @Override
     public void onCommandResult(Context context, CmdMessage cmdMessage) {
-        Log.e(TAG,"[onCommandResult] "+cmdMessage);
+        Log.e(TAG, "[onCommandResult] " + cmdMessage);
     }
 
     @Override
     public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
+        TagAliasOperatorHelper.getInstance().onTagOperatorResult(context, jPushMessage);
         super.onTagOperatorResult(context, jPushMessage);
     }
+
     @Override
-    public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
-        TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
+    public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) {
+        TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context, jPushMessage);
         super.onCheckTagOperatorResult(context, jPushMessage);
     }
+
     @Override
     public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
+        TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context, jPushMessage);
         super.onAliasOperatorResult(context, jPushMessage);
     }
 
     @Override
     public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
+        TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context, jPushMessage);
         super.onMobileNumberOperatorResult(context, jPushMessage);
     }
 
@@ -134,7 +137,7 @@ public class JiGuangPushMessageReceiver extends JPushMessageReceiver {
     @Override
     public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
         super.onNotificationSettingsCheck(context, isOn, source);
-        Log.e(TAG,"[onNotificationSettingsCheck] isOn:"+isOn+",source:"+source);
+        Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
     }
-    
+
 }
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/LocalBroadcastManager.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/LocalBroadcastManager.java
index 9a1995c44b77bec3ef295e591ab5f2baf001673f..12a9f73317d5dd97eb1424a7b4deea150445dfbf 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/LocalBroadcastManager.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/LocalBroadcastManager.java
@@ -17,7 +17,7 @@ import java.util.Set;
  */
 
 public final class LocalBroadcastManager {
-    private static final String TAG = "JIGUANG-Example";
+    private static final String TAG = JiGuangApplication.TAG;
     private static final boolean DEBUG = false;
     private final Context mAppContext;
     private final HashMap<BroadcastReceiver, ArrayList<IntentFilter>> mReceivers = new HashMap<BroadcastReceiver, ArrayList<IntentFilter>>();
@@ -127,7 +127,7 @@ public final class LocalBroadcastManager {
             ArrayList entries = (ArrayList) this.mActions.get(intent.getAction());
             if (entries != null) {
                 if (debug) {
-                   Logger.v("LocalBroadcastManager", "Action list: " + entries);
+                    Logger.v("LocalBroadcastManager", "Action list: " + entries);
                 }
 
                 ArrayList receivers = null;
@@ -141,7 +141,7 @@ public final class LocalBroadcastManager {
 
                     if (receiver.broadcasting) {
                         if (debug) {
-                           Logger.v("LocalBroadcastManager", "  Filter\'s target already added");
+                            Logger.v("LocalBroadcastManager", "  Filter\'s target already added");
                         }
                     } else {
                         int match = receiver.filter.match(action, type, scheme, data, categories, "LocalBroadcastManager");
@@ -175,7 +175,7 @@ public final class LocalBroadcastManager {
                                     reason = "unknown reason";
                             }
 
-                           Logger.v("LocalBroadcastManager", "  Filter did not match: " + reason);
+                            Logger.v("LocalBroadcastManager", "  Filter did not match: " + reason);
                         }
                     }
                 }
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/MyReceiver.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/MyReceiver.java
index bd52cd52c34eb0975b43655191af15588b5a700c..8e3dbd1971342565d9e3d6c3c51cb9f6a2ec8945 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/MyReceiver.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/MyReceiver.java
@@ -15,109 +15,109 @@ import cn.jpush.android.api.JPushInterface;
 
 /**
  * 自定义接收器
- * 
+ * <p>
  * 如果不定义这个 Receiver，则：
  * 1) 默认用户会打开主界面
  * 2) 接收不到自定义消息
  */
 public class MyReceiver extends BroadcastReceiver {
-	private static final String TAG = "JIGUANG-Example";
-
-	@Override
-	public void onReceive(Context context, Intent intent) {
-		try {
-			Bundle bundle = intent.getExtras();
-			Logger.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
-
-			if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
-				String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
-				Logger.d(TAG, "[MyReceiver] 接收Registration Id : " + regId);
-				//send the Registration Id to your server...
-
-			} else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
-				Logger.d(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
-				processCustomMessage(context, bundle);
-
-			} else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
-				Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知");
-				int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
-				Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId);
-
-			} else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
-				Logger.d(TAG, "[MyReceiver] 用户点击打开了通知");
-
-				//打开自定义的Activity
-				Intent i = new Intent(context, TestActivity.class);
-				i.putExtras(bundle);
-				//i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP );
-				context.startActivity(i);
-
-			} else if(JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
-				boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
-				Logger.w(TAG, "[MyReceiver]" + intent.getAction() +" connected state change to "+connected);
-			} else {
-				Logger.d(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction());
-			}
-		} catch (Exception e){
-
-		}
-
-	}
-
-	// 打印所有的 intent extra 数据
-	private static String printBundle(Bundle bundle) {
-		StringBuilder sb = new StringBuilder();
-		for (String key : bundle.keySet()) {
-			if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
-				sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
-			}else if(key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)){
-				sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
-			} else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
-				if (TextUtils.isEmpty(bundle.getString(JPushInterface.EXTRA_EXTRA))) {
-					Logger.i(TAG, "This message has no Extra data");
-					continue;
-				}
-
-				try {
-					JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
-					Iterator<String> it =  json.keys();
-
-					while (it.hasNext()) {
-						String myKey = it.next();
-						sb.append("\nkey:" + key + ", value: [" +
-								myKey + " - " +json.optString(myKey) + "]");
-					}
-				} catch (JSONException e) {
-					Logger.e(TAG, "Get message extra JSON error!");
-				}
-
-			} else {
-				sb.append("\nkey:" + key + ", value:" + bundle.get(key));
-			}
-		}
-		return sb.toString();
-	}
-	
-	//send msg to MainActivity
-	private void processCustomMessage(Context context, Bundle bundle) {
-		if (JiGuangPushMainActivity.isForeground) {
-			String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
-			String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
-			Intent msgIntent = new Intent(JiGuangPushMainActivity.MESSAGE_RECEIVED_ACTION);
-			msgIntent.putExtra(JiGuangPushMainActivity.KEY_MESSAGE, message);
-			if (!ExampleUtil.isEmpty(extras)) {
-				try {
-					JSONObject extraJson = new JSONObject(extras);
-					if (extraJson.length() > 0) {
-						msgIntent.putExtra(JiGuangPushMainActivity.KEY_EXTRAS, extras);
-					}
-				} catch (JSONException e) {
-
-				}
-
-			}
-			LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
-		}
-	}
+    private static final String TAG = JiGuangApplication.TAG;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        try {
+            Bundle bundle = intent.getExtras();
+            Logger.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
+
+            if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
+                String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
+                Logger.d(TAG, "[MyReceiver] 接收Registration Id : " + regId);
+                //send the Registration Id to your server...
+
+            } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
+                Logger.d(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
+                processCustomMessage(context, bundle);
+
+            } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
+                Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知");
+                int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
+                Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId);
+
+            } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
+                Logger.d(TAG, "[MyReceiver] 用户点击打开了通知");
+
+                //打开自定义的Activity
+                Intent i = new Intent(context, TestActivity.class);
+                i.putExtras(bundle);
+                //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                context.startActivity(i);
+
+            } else if (JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
+                boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
+                Logger.w(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected);
+            } else {
+                Logger.d(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction());
+            }
+        } catch (Exception e) {
+
+        }
+
+    }
+
+    // 打印所有的 intent extra 数据
+    private static String printBundle(Bundle bundle) {
+        StringBuilder sb = new StringBuilder();
+        for (String key : bundle.keySet()) {
+            if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
+                sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
+            } else if (key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)) {
+                sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
+            } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
+                if (TextUtils.isEmpty(bundle.getString(JPushInterface.EXTRA_EXTRA))) {
+                    Logger.i(TAG, "This message has no Extra data");
+                    continue;
+                }
+
+                try {
+                    JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
+                    Iterator<String> it = json.keys();
+
+                    while (it.hasNext()) {
+                        String myKey = it.next();
+                        sb.append("\nkey:" + key + ", value: [" +
+                                myKey + " - " + json.optString(myKey) + "]");
+                    }
+                } catch (JSONException e) {
+                    Logger.e(TAG, "Get message extra JSON error!");
+                }
+
+            } else {
+                sb.append("\nkey:" + key + ", value:" + bundle.get(key));
+            }
+        }
+        return sb.toString();
+    }
+
+    //send msg to MainActivity
+    private void processCustomMessage(Context context, Bundle bundle) {
+        if (JiGuangPushMainActivity.isForeground) {
+            String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
+            String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
+            Intent msgIntent = new Intent(JiGuangPushMainActivity.MESSAGE_RECEIVED_ACTION);
+            msgIntent.putExtra(JiGuangPushMainActivity.KEY_MESSAGE, message);
+            if (!ExampleUtil.isEmpty(extras)) {
+                try {
+                    JSONObject extraJson = new JSONObject(extras);
+                    if (extraJson.length() > 0) {
+                        msgIntent.putExtra(JiGuangPushMainActivity.KEY_EXTRAS, extras);
+                    }
+                } catch (JSONException e) {
+
+                }
+
+            }
+            LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
+        }
+    }
 }
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/PushSetActivity.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/PushSetActivity.java
index b809dd8b049ebcf1a8ba6c226a2d7d007be208c2..82bcc4095384efb58327ceba6e97c5c56d33d52c 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/PushSetActivity.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/PushSetActivity.java
@@ -12,8 +12,6 @@ import android.view.View.OnClickListener;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.wzq.jiguangpush.R;
-
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -25,12 +23,12 @@ import cn.jpush.android.api.TagAliasCallback;
 
 
 public class PushSetActivity extends Activity implements OnClickListener {
-    private static final String TAG = "JIGUANG-Example";
+    private static final String TAG = JiGuangApplication.TAG;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        setContentView(R.layout.push_set_dialog);
+        setContentView(R.layout.jiguang_push_set_dialog);
         initListener();
     }
 
@@ -86,7 +84,7 @@ public class PushSetActivity extends Activity implements OnClickListener {
     TagAliasCallback tagAlias = new TagAliasCallback() {
         @Override
         public void gotResult(int responseCode, String alias, Set<String> tags) {
-            Log.e(TAG,"responseCode:"+responseCode+",alias:"+alias+",tags:"+tags);
+            Log.e(TAG, "responseCode:" + responseCode + ",alias:" + alias + ",tags:" + tags);
         }
     };
 
@@ -108,7 +106,7 @@ public class PushSetActivity extends Activity implements OnClickListener {
      * 设置通知栏样式 - 定义通知栏Layout
      */
     private void setStyleCustom() {
-        CustomPushNotificationBuilder builder = new CustomPushNotificationBuilder(PushSetActivity.this, R.layout.customer_notitfication_layout, R.id.icon, R.id.title, R.id.text);
+        CustomPushNotificationBuilder builder = new CustomPushNotificationBuilder(PushSetActivity.this, R.layout.jiguang_customer_notitfication_layout, R.id.icon, R.id.title, R.id.text);
         builder.layoutIconDrawable = R.drawable.ic_launcher;
         builder.developerArg0 = "developerArg2";
         JPushInterface.setPushNotificationBuilder(2, builder);
@@ -140,7 +138,7 @@ public class PushSetActivity extends Activity implements OnClickListener {
 
     /**
      * 处理tag/alias相关操作的点击
-     * */
+     */
     public void onTagAliasAction(View view) {
         Set<String> tags = null;
         String alias = null;
@@ -205,16 +203,16 @@ public class PushSetActivity extends Activity implements OnClickListener {
         TagAliasOperatorHelper.TagAliasBean tagAliasBean = new TagAliasOperatorHelper.TagAliasBean();
         tagAliasBean.action = action;
         TagAliasOperatorHelper.sequence++;
-        if(isAliasAction){
+        if (isAliasAction) {
             tagAliasBean.alias = alias;
-        }else{
+        } else {
             tagAliasBean.tags = tags;
         }
         tagAliasBean.isAliasAction = isAliasAction;
-        TagAliasOperatorHelper.getInstance().handleAction(getApplicationContext(), TagAliasOperatorHelper.sequence,tagAliasBean);
+        TagAliasOperatorHelper.getInstance().handleAction(getApplicationContext(), TagAliasOperatorHelper.sequence, tagAliasBean);
     }
 
-    private void handleSetMobileNumber(){
+    private void handleSetMobileNumber() {
         EditText mobileEdit = (EditText) findViewById(R.id.et_mobilenumber);
         String mobileNumber = mobileEdit.getText().toString().trim();
         if (TextUtils.isEmpty(mobileNumber)) {
@@ -225,12 +223,13 @@ public class PushSetActivity extends Activity implements OnClickListener {
             return;
         }
         TagAliasOperatorHelper.sequence++;
-        TagAliasOperatorHelper.getInstance().handleAction(getApplicationContext(), TagAliasOperatorHelper.sequence,mobileNumber);
+        TagAliasOperatorHelper.getInstance().handleAction(getApplicationContext(), TagAliasOperatorHelper.sequence, mobileNumber);
     }
+
     /**
      * 获取输入的alias
-     * */
-    private String getInPutAlias(){
+     */
+    private String getInPutAlias() {
         EditText aliasEdit = (EditText) findViewById(R.id.et_alias);
         String alias = aliasEdit.getText().toString().trim();
         if (TextUtils.isEmpty(alias)) {
@@ -243,10 +242,11 @@ public class PushSetActivity extends Activity implements OnClickListener {
         }
         return alias;
     }
+
     /**
      * 获取输入的tags
-     * */
-    private Set<String> getInPutTags(){
+     */
+    private Set<String> getInPutTags() {
         EditText tagEdit = (EditText) findViewById(R.id.et_tag);
         String tag = tagEdit.getText().toString().trim();
         // 检查 tag 的有效性
@@ -265,7 +265,7 @@ public class PushSetActivity extends Activity implements OnClickListener {
             }
             tagSet.add(sTagItme);
         }
-        if(tagSet.isEmpty()){
+        if (tagSet.isEmpty()) {
             Toast.makeText(getApplicationContext(), R.string.error_tag_empty, Toast.LENGTH_SHORT).show();
             return null;
         }
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/SettingActivity.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/SettingActivity.java
index b953fc552179bf417a5c8a40083d2c83622fe2b8..6fa7179fa011e56238b8ba222aa450262187478a 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/SettingActivity.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/SettingActivity.java
@@ -14,183 +14,180 @@ import android.widget.CheckBox;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
-import com.wzq.jiguangpush.R;
-
 import java.util.HashSet;
 import java.util.Set;
 
 import cn.jpush.android.api.JPushInterface;
 
 public class SettingActivity extends Activity implements OnClickListener {
-	TimePicker startTime;
-	TimePicker endTime;
-	CheckBox mMonday ;
-	CheckBox mTuesday ;
-	CheckBox mWednesday;
-	CheckBox mThursday;
-	CheckBox mFriday ;
-	CheckBox mSaturday;
-	CheckBox mSunday ;
-	Button mSetTime;
-	SharedPreferences mSettings;
-	Editor mEditor;
-	
-	@Override
-	public void onCreate(Bundle icicle) {
-		super.onCreate(icicle);
-		setContentView(R.layout.set_push_time);
-		init();
-		initListener();
-	}
-	
-   @Override
+    TimePicker startTime;
+    TimePicker endTime;
+    CheckBox mMonday;
+    CheckBox mTuesday;
+    CheckBox mWednesday;
+    CheckBox mThursday;
+    CheckBox mFriday;
+    CheckBox mSaturday;
+    CheckBox mSunday;
+    Button mSetTime;
+    SharedPreferences mSettings;
+    Editor mEditor;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.jiguang_set_push_time);
+        init();
+        initListener();
+    }
+
+    @Override
     public void onStart() {
-	    super.onStart();
-	    initData();
-   }
-   
-	private void init(){
-		startTime = (TimePicker) findViewById(R.id.start_time);
-		endTime = (TimePicker) findViewById(R.id.end_time);
-		startTime.setIs24HourView(DateFormat.is24HourFormat(this));
-		endTime.setIs24HourView(DateFormat.is24HourFormat(this));
-		mSetTime = (Button)findViewById(R.id.bu_setTime);
-		mMonday = (CheckBox)findViewById(R.id.cb_monday);
-		mTuesday = (CheckBox)findViewById(R.id.cb_tuesday);
-		mWednesday = (CheckBox)findViewById(R.id.cb_wednesday);
-	    mThursday = (CheckBox)findViewById(R.id.cb_thursday);
-		mFriday = (CheckBox)findViewById(R.id.cb_friday);
-		mSaturday = (CheckBox)findViewById(R.id.cb_saturday);
-		mSunday = (CheckBox)findViewById(R.id.cb_sunday);
-	}
-  
-    private void initListener(){
-	   mSetTime.setOnClickListener(this);
+        super.onStart();
+        initData();
+    }
+
+    private void init() {
+        startTime = (TimePicker) findViewById(R.id.start_time);
+        endTime = (TimePicker) findViewById(R.id.end_time);
+        startTime.setIs24HourView(DateFormat.is24HourFormat(this));
+        endTime.setIs24HourView(DateFormat.is24HourFormat(this));
+        mSetTime = (Button) findViewById(R.id.bu_setTime);
+        mMonday = (CheckBox) findViewById(R.id.cb_monday);
+        mTuesday = (CheckBox) findViewById(R.id.cb_tuesday);
+        mWednesday = (CheckBox) findViewById(R.id.cb_wednesday);
+        mThursday = (CheckBox) findViewById(R.id.cb_thursday);
+        mFriday = (CheckBox) findViewById(R.id.cb_friday);
+        mSaturday = (CheckBox) findViewById(R.id.cb_saturday);
+        mSunday = (CheckBox) findViewById(R.id.cb_sunday);
+    }
+
+    private void initListener() {
+        mSetTime.setOnClickListener(this);
+    }
+
+    private void initData() {
+        mSettings = getSharedPreferences(ExampleUtil.PREFS_NAME, MODE_PRIVATE);
+        String days = mSettings.getString(ExampleUtil.PREFS_DAYS, "");
+        if (!TextUtils.isEmpty(days)) {
+            initAllWeek(false);
+            String[] sArray = days.split(",");
+            for (String day : sArray) {
+                setWeek(day);
+            }
+        } else {
+            initAllWeek(true);
+        }
+
+        int startTimeStr = mSettings.getInt(ExampleUtil.PREFS_START_TIME, 0);
+        startTime.setCurrentHour(startTimeStr);
+        int endTimeStr = mSettings.getInt(ExampleUtil.PREFS_END_TIME, 23);
+        endTime.setCurrentHour(endTimeStr);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.bu_setTime) {
+            v.requestFocus();
+            v.requestFocusFromTouch();
+            setPushTime();
+        }
+    }
+
+    /**
+     * 设置允许接收通知时间
+     */
+    private void setPushTime() {
+        int startime = startTime.getCurrentHour();
+        int endtime = endTime.getCurrentHour();
+        if (startime > endtime) {
+            Toast.makeText(SettingActivity.this, "开始时间不能大于结束时间", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        StringBuffer daysSB = new StringBuffer();
+        Set<Integer> days = new HashSet<Integer>();
+        if (mSunday.isChecked()) {
+            days.add(0);
+            daysSB.append("0,");
+        }
+        if (mMonday.isChecked()) {
+            days.add(1);
+            daysSB.append("1,");
+        }
+        if (mTuesday.isChecked()) {
+            days.add(2);
+            daysSB.append("2,");
+        }
+        if (mWednesday.isChecked()) {
+            days.add(3);
+            daysSB.append("3,");
+        }
+        if (mThursday.isChecked()) {
+            days.add(4);
+            daysSB.append("4,");
+        }
+        if (mFriday.isChecked()) {
+            days.add(5);
+            daysSB.append("5,");
+        }
+        if (mSaturday.isChecked()) {
+            days.add(6);
+            daysSB.append("6,");
+        }
+
+        //调用JPush api设置Push时间
+        JPushInterface.setPushTime(getApplicationContext(), days, startime, endtime);
+
+        mEditor = mSettings.edit();
+        mEditor.putString(ExampleUtil.PREFS_DAYS, daysSB.toString());
+        mEditor.putInt(ExampleUtil.PREFS_START_TIME, startime);
+        mEditor.putInt(ExampleUtil.PREFS_END_TIME, endtime);
+        mEditor.commit();
+        Toast.makeText(SettingActivity.this, R.string.setting_su, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            finish();
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void setWeek(String day) {
+        int dayId = Integer.valueOf(day);
+        switch (dayId) {
+            case 0:
+                mSunday.setChecked(true);
+                break;
+            case 1:
+                mMonday.setChecked(true);
+                break;
+            case 2:
+                mTuesday.setChecked(true);
+                break;
+            case 3:
+                mWednesday.setChecked(true);
+                break;
+            case 4:
+                mThursday.setChecked(true);
+                break;
+            case 5:
+                mFriday.setChecked(true);
+                break;
+            case 6:
+                mSaturday.setChecked(true);
+                break;
+        }
+    }
+
+    private void initAllWeek(boolean isChecked) {
+        mSunday.setChecked(isChecked);
+        mMonday.setChecked(isChecked);
+        mTuesday.setChecked(isChecked);
+        mWednesday.setChecked(isChecked);
+        mThursday.setChecked(isChecked);
+        mFriday.setChecked(isChecked);
+        mSaturday.setChecked(isChecked);
     }
-   
-    private void initData(){
-	  mSettings = getSharedPreferences(ExampleUtil.PREFS_NAME, MODE_PRIVATE);
-	  String days = mSettings.getString(ExampleUtil.PREFS_DAYS, "");
-		if (!TextUtils.isEmpty(days)) {
-			initAllWeek(false);
-			String[] sArray = days.split(",");
-			for (String day : sArray) {
-				setWeek(day);
-			}
-		} else {
-			initAllWeek(true);
-		}
-		
-	  int startTimeStr = mSettings.getInt(ExampleUtil.PREFS_START_TIME, 0);
-	  startTime.setCurrentHour(startTimeStr);
-	  int endTimeStr = mSettings.getInt(ExampleUtil.PREFS_END_TIME, 23);
-	  endTime.setCurrentHour(endTimeStr);
-   }
-
-	@Override
-	public void onClick(View v) {
-		if (v.getId() == R.id.bu_setTime) {
-			v.requestFocus();
-			v.requestFocusFromTouch();
-			setPushTime();
-		}
-	}
-	
-	/**
-	 *设置允许接收通知时间
-	 */
-	private void setPushTime(){
-		int startime = startTime.getCurrentHour();
-		int endtime = endTime.getCurrentHour();
-		if (startime > endtime) {
-			Toast.makeText(SettingActivity.this, "开始时间不能大于结束时间", Toast.LENGTH_SHORT).show();
-			return;
-		}
-		StringBuffer daysSB = new StringBuffer();
-		Set<Integer> days = new HashSet<Integer>();
-		if (mSunday.isChecked()) {
-			days.add(0);
-			daysSB.append("0,");
-		}
-		if (mMonday.isChecked()) {
-			days.add(1);
-			daysSB.append("1,");
-		}
-		if (mTuesday.isChecked()) {
-			days.add(2);
-			daysSB.append("2,");
-		}
-		if (mWednesday.isChecked()) {
-			days.add(3);
-			daysSB.append("3,");
-		}
-		if (mThursday.isChecked()) {
-			days.add(4);
-			daysSB.append("4,");
-		}
-		if (mFriday.isChecked()) {
-			days.add(5);
-			daysSB.append("5,");
-		}
-		if (mSaturday.isChecked()) {
-			days.add(6);
-			daysSB.append("6,");
-		}
-		
-	
-		//调用JPush api设置Push时间
-		JPushInterface.setPushTime(getApplicationContext(), days, startime, endtime);
-		
-		mEditor = mSettings.edit();
-		mEditor.putString(ExampleUtil.PREFS_DAYS, daysSB.toString());
-		mEditor.putInt(ExampleUtil.PREFS_START_TIME, startime);
-		mEditor.putInt(ExampleUtil.PREFS_END_TIME, endtime);
-		mEditor.commit();
-		Toast.makeText(SettingActivity.this, R.string.setting_su, Toast.LENGTH_SHORT).show();
-	}
-
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_BACK){
-			finish();
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-	
-	private void setWeek(String day){
-		   int dayId = Integer.valueOf(day);
-		   switch (dayId) {
-			case 0:
-				mSunday.setChecked(true);
-				break;
-			case 1:
-				mMonday.setChecked(true);
-				break;
-			case 2:
-				mTuesday.setChecked(true);
-				break;
-			case 3:
-				mWednesday.setChecked(true);
-				break;
-			case 4:
-				mThursday.setChecked(true);
-				break;
-			case 5:
-				mFriday.setChecked(true);
-				break;
-			case 6:
-				mSaturday.setChecked(true);
-				break;
-			}
-	   }
-	
-	private void initAllWeek(boolean isChecked) {
-		mSunday.setChecked(isChecked);
-		mMonday.setChecked(isChecked);
-		mTuesday.setChecked(isChecked);
-		mWednesday.setChecked(isChecked);
-		mThursday.setChecked(isChecked);
-		mFriday.setChecked(isChecked);
-		mSaturday.setChecked(isChecked);
-	}
 }
\ No newline at end of file
diff --git a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/TagAliasOperatorHelper.java b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/TagAliasOperatorHelper.java
index 436b6bc99a0832a5665af56ee0e0a7f800bbb01e..417fd5c5b0cc3678a8b544be124cb2375ebce96d 100644
--- a/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/TagAliasOperatorHelper.java
+++ b/pushbase/jiguangpush/src/main/java/com/wzq/jiguangpush/TagAliasOperatorHelper.java
@@ -15,7 +15,7 @@ import cn.jpush.android.api.JPushMessage;
  * 处理tagalias相关的逻辑
  */
 public class TagAliasOperatorHelper {
-    private static final String TAG = "JIGUANG-TagAliasHelper";
+    private static final String TAG = JiGuangApplication.TAG;
     public static int sequence = 1;
     /**
      * 增加
@@ -142,10 +142,10 @@ public class TagAliasOperatorHelper {
                     JPushInterface.getAlias(context, sequence);
                     break;
                 case ACTION_DELETE:
-                    JPushInterface.deleteAlias(context, sequence);
+                    JPushInterface.deleteAlias(context, 1);
                     break;
                 case ACTION_SET:
-                    JPushInterface.setAlias(context, sequence, tagAliasBean.alias);
+                    JPushInterface.setAlias(context, 1, tagAliasBean.alias);
                     break;
                 default:
                     Logger.w(TAG, "unsupport alias action type");
diff --git a/pushbase/jiguangpush/src/main/res/layout/customer_notitfication_layout.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_customer_notitfication_layout.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/customer_notitfication_layout.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_customer_notitfication_layout.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/customer_notitfication_layout_one.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_customer_notitfication_layout_one.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/customer_notitfication_layout_one.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_customer_notitfication_layout_one.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/jpush_inapp_banner.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_inapp_banner.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/jpush_inapp_banner.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_inapp_banner.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/main.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_main.xml
similarity index 80%
rename from pushbase/jiguangpush/src/main/res/layout/main.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_main.xml
index fff61b4f97bf751ea3ebead470beb66d912d3a63..4537f54837a81419e9ea59906a8f753372b3c1ce 100644
--- a/pushbase/jiguangpush/src/main/res/layout/main.xml
+++ b/pushbase/jiguangpush/src/main/res/layout/jiguang_main.xml
@@ -3,6 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/tiledstripes">
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -11,45 +12,51 @@
 
         <TextView
             android:id="@+id/tv_regId"
-            android:textIsSelectable="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip" />
+            android:layout_marginTop="8dip"
+            android:textColor="@color/colorAccent"
+            android:textIsSelectable="true"
+            android:textSize="22dp" />
 
         <TextView
             android:id="@+id/tv_appkey"
-            android:textIsSelectable="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip" />
+            android:layout_marginTop="8dip"
+            android:textIsSelectable="true" />
 
         <TextView
             android:id="@+id/tv_package"
-            android:textIsSelectable="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip" />
+            android:layout_marginTop="8dip"
+            android:textIsSelectable="true" />
 
         <TextView
             android:id="@+id/tv_imei"
-            android:textIsSelectable="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip" />
+            android:layout_marginTop="8dip"
+            android:gravity="center"
+            android:text="IMME Code"
+            android:textColor="@color/colorAccent"
+            android:textIsSelectable="true"
+            android:textSize="22dp" />
 
         <TextView
             android:id="@+id/tv_device_id"
-            android:textIsSelectable="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip" />
+            android:layout_marginTop="8dip"
+            android:textIsSelectable="true" />
 
         <TextView
             android:id="@+id/tv_version"
-            android:textIsSelectable="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip" />
+            android:layout_marginTop="8dip"
+            android:textIsSelectable="true" />
 
         <Button
             android:id="@+id/init"
@@ -87,7 +94,6 @@
             android:visibility="invisible" />
 
 
-
     </LinearLayout>
 
     <Button
diff --git a/pushbase/jiguangpush/src/main/res/layout/jpush_popwin_layout.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_popwin_layout.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/jpush_popwin_layout.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_popwin_layout.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/push_notification.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_push_notification.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/push_notification.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_push_notification.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/push_notification_large.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_push_notification_large.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/push_notification_large.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_push_notification_large.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/push_notification_middle.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_push_notification_middle.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/push_notification_middle.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_push_notification_middle.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/push_set_dialog.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_push_set_dialog.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/push_set_dialog.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_push_set_dialog.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/set_push_time.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_set_push_time.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/set_push_time.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_set_push_time.xml
diff --git a/pushbase/jiguangpush/src/main/res/layout/jpush_webview_layout.xml b/pushbase/jiguangpush/src/main/res/layout/jiguang_webview_layout.xml
similarity index 100%
rename from pushbase/jiguangpush/src/main/res/layout/jpush_webview_layout.xml
rename to pushbase/jiguangpush/src/main/res/layout/jiguang_webview_layout.xml
diff --git a/router/build.gradle b/router/build.gradle
index eb5e5199d93fc198b0f36d1c301a86204ba67e5d..325d94d0e310f055833947af21af1c68eb86009f 100644
--- a/router/build.gradle
+++ b/router/build.gradle
@@ -7,7 +7,6 @@ apply plugin: 'kotlin-android-extensions'*/
 plugins{
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
 }
 
 android {