• fengruiyu's avatar
    Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev · 3064d4a4
    fengruiyu authored
     Conflicts:
    	app/src/main/res/mipmap-xhdpi/icon_backvip5.png
    	app/src/main/res/mipmap-xhdpi/icon_card.webp
    	app/src/main/res/mipmap-xhdpi/icon_card1.webp
    	app/src/main/res/mipmap-xhdpi/icon_card2.webp
    	app/src/main/res/mipmap-xhdpi/icon_card3.webp
    	app/src/main/res/mipmap-xhdpi/icon_card4.webp
    	app/src/main/res/mipmap-xhdpi/icon_card5.webp
    	app/src/main/res/mipmap-xhdpi/icon_card6.webp
    	app/src/main/res/mipmap-xhdpi/icon_card7.webp
    	app/src/main/res/mipmap-xhdpi/icon_privilege6.png
    3064d4a4
Name
Last commit
Last update
..
ad Loading commit data...
adapter Loading commit data...
api Loading commit data...
bean Loading commit data...
common Loading commit data...
db Loading commit data...
eventbean Loading commit data...
login Loading commit data...
main Loading commit data...
manager Loading commit data...
model Loading commit data...
netwrok Loading commit data...
services Loading commit data...
splash Loading commit data...
utils Loading commit data...
webview Loading commit data...
widget Loading commit data...
AppApplication.kt Loading commit data...