Skip to content

Commit

Permalink
修改友盟
Browse files Browse the repository at this point in the history
  • Loading branch information
puyang1017 committed Jun 4, 2019
1 parent 1f07c69 commit d50405c
Show file tree
Hide file tree
Showing 31 changed files with 419 additions and 15 deletions.
16 changes: 8 additions & 8 deletions conf.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ ext {
"cookiebar" : 'com.liuguangqiang.cookie:library:0.3',
"ARecyclerView" : 'com.github.limedroid:ARecyclerView:v1.2.1',
"explosionfield" : 'tyrantgit:explosionfield:1.0.1',
"umeng-common" : 'com.umeng.sdk:common:2.0.0',
"umeng-analytics" : 'com.umeng.sdk:analytics:8.0.0',
"umeng-utdid" : 'com.umeng.sdk:utdid:1.1.5.3',
"umeng-debug" : 'com.umeng.sdk:debug:1.0.0',
"umeng-share" : 'com.umeng.sdk:share-core:6.9.2',
"umeng-share-qq" : 'com.umeng.sdk:share-qq:6.9.2.0',
"umeng-share-wechat" : 'com.umeng.sdk:share-wechat:6.9.2',
"umeng-share-sina" : 'com.umeng.sdk:share-sina:6.9.2',
// "umeng-common" : 'com.umeng.sdk:common:2.0.0',
// "umeng-analytics" : 'com.umeng.sdk:analytics:8.0.0',
// "umeng-utdid" : 'com.umeng.sdk:utdid:1.1.5.3',
// "umeng-debug" : 'com.umeng.sdk:debug:1.0.0',
// "umeng-share" : 'com.umeng.sdk:share-core:6.9.4',
// "umeng-share-qq" : 'com.umeng.sdk:share-qq:6.9.4.0',
// "umeng-share-wechat" : 'com.umeng.sdk:share-wechat:6.9.4',
// "umeng-share-sina" : 'com.umeng.sdk:share-sina:6.9.4',
"logger" : 'com.orhanobut:logger:2.2.0',
"walle" : 'com.meituan.android.walle:library:1.1.6',
"mdprogress" :'com.jaywei:mdprogress:1.0.2',
Expand Down
21 changes: 14 additions & 7 deletions puymvpjava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,26 @@ dependencies {
implementation rootProject.ext.dependencies["eventbus"]
implementation rootProject.ext.dependencies["barlibrary"]
implementation rootProject.ext.dependencies["swipebacklayout"]
// implementation rootProject.ext.dependencies["umeng-common"]
// implementation rootProject.ext.dependencies["umeng-analytics"]
implementation rootProject.ext.dependencies["umeng-debug"]
implementation rootProject.ext.dependencies["umeng-share"]
implementation rootProject.ext.dependencies["umeng-share-qq"]
implementation rootProject.ext.dependencies["umeng-share-wechat"]
implementation rootProject.ext.dependencies["umeng-share-sina"]
// implementation rootProject.ext.dependencies["umeng-common"]
// implementation rootProject.ext.dependencies["umeng-analytics"]
// implementation rootProject.ext.dependencies["umeng-debug"]
// implementation rootProject.ext.dependencies["umeng-share"]
// implementation rootProject.ext.dependencies["umeng-share-qq"]
// implementation rootProject.ext.dependencies["umeng-share-wechat"]
// implementation rootProject.ext.dependencies["umeng-share-sina"]
implementation rootProject.ext.dependencies["mqttv3"]
implementation rootProject.ext.dependencies["fragmentation"]
implementation rootProject.ext.dependencies["facebookrebound"]
implementation files('libs/commons-codec-1.11.jar')
api files('libs/umeng-analytics-8.0.2.jar')
api files('libs/umeng-common-2.0.2.jar')
api files('libs/umeng-share-core-6.9.4.jar')
api files('libs/umeng-share-QQ-simplify-6.9.4.jar')
api files('libs/umeng-share-sina-simplify-6.9.4.jar')
api files('libs/umeng-share-wechat-simplify-6.9.4.jar')
api files('libs/umeng-shareboard-widget-6.9.4.jar')
api files('libs/umeng-sharetool-6.9.4.jar')
api files('libs/utdid4all-1.1.5.3_proguard.jar')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
Expand Down
Binary file added puymvpjava/libs/umeng-share-QQ-simplify-6.9.4.jar
Binary file not shown.
Binary file added puymvpjava/libs/umeng-share-core-6.9.4.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added puymvpjava/libs/umeng-sharetool-6.9.4.jar
Binary file not shown.
Binary file added puymvpjava/libs/utdid4all-1.1.5.3_proguard.jar
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions puymvpjava/src/main/res/drawable/umeng_socialize_btn_bg.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent" />
<stroke android:width="1dp"
android:color="#ffffff"

/>


</shape>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions puymvpjava/src/main/res/drawable/umeng_socialize_edit_bg.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent" />
<stroke android:width="1dp"
android:color="#C3C6C9"

/>


</shape>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions puymvpjava/src/main/res/layout/socialize_share_menu_item.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">

<com.umeng.socialize.shareboard.SocializeImageView
android:id="@+id/socialize_image_view"
android:layout_width="50dp"
android:layout_height="50dp"
android:padding="5dp"
android:src="@drawable/umeng_socialize_menu_default" />

<TextView
android:id="@+id/socialize_text_view"
android:layout_width="63dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="未知"
android:textSize="12sp" />

</LinearLayout>
121 changes: 121 additions & 0 deletions puymvpjava/src/main/res/layout/umeng_socialize_oauth_dialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#D4E0E5">


<RelativeLayout
android:id="@+id/umeng_socialize_titlebar"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="#0086DC">

<TextView
android:id="@+id/umeng_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text=""
android:textColor="#ffffff"
android:textSize="18sp" />

<RelativeLayout
android:id="@+id/umeng_back"
android:layout_width="60dp"
android:layout_height="match_parent"

android:onClick="onCancel"
android:visibility="visible">

<ImageButton

android:layout_width="12dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:background="@drawable/umeng_socialize_back_icon"
android:layout_marginLeft="15dp"
android:scaleType="center" />
</RelativeLayout>

<TextView
android:id="@+id/umeng_share_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="10dp"
android:background="@drawable/umeng_socialize_btn_bg"
android:padding="4dp"
android:text="分享"
android:textColor="#ffffff" />
</RelativeLayout>

<RelativeLayout
android:id="@+id/umeng_socialize_follow"
android:layout_width="fill_parent"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:background="#AAAAAA"
android:visibility="visible">

<CheckBox
android:id="@+id/umeng_socialize_follow_check"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:checked="true"
android:visibility="gone" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@id/umeng_socialize_follow_check"
android:text="关注官方微博"
android:textColor="#f8f8f8"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>

<!--<LinearLayout-->
<!--android:id="@+id/webView_container"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:layout_above="@id/umeng_socialize_follow"-->
<!--android:layout_below="@id/umeng_socialize_titlebar"-->
<!--android:orientation="horizontal"-->
<!--android:visibility="visible" />-->

<WebView
android:id="@+id/webView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#F2F5F6"
android:layout_above="@id/umeng_socialize_follow"
android:layout_below="@id/umeng_socialize_titlebar"
android:visibility="visible" />

<RelativeLayout
android:id="@+id/progress_bar_parent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@id/umeng_socialize_titlebar"
android:background="#F2F5F6" >

<LinearLayout
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:orientation="horizontal">

<ProgressBar
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_margin="10dp" />
</LinearLayout>
</RelativeLayout>

</RelativeLayout>
137 changes: 137 additions & 0 deletions puymvpjava/src/main/res/layout/umeng_socialize_share.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#D4E0E5"
android:id="@+id/root"
android:orientation="vertical">

<RelativeLayout
android:id="@+id/umeng_socialize_share_titlebar"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="#0086DC">

<TextView
android:id="@+id/umeng_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text=""
android:textColor="#ffffff"
android:textSize="18sp" />

<RelativeLayout
android:id="@+id/umeng_back"
android:layout_width="50dp"
android:layout_height="match_parent"
android:onClick="onCancel"
android:visibility="visible">

<ImageButton
android:layout_width="12dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:background="@drawable/umeng_socialize_back_icon"
android:clickable="false"
android:scaleType="center" />
</RelativeLayout>

<TextView
android:id="@+id/umeng_share_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="分享"
android:textColor="#ffffff"
android:textSize="15sp" />
</RelativeLayout>

<EditText
android:id="@+id/umeng_socialize_share_edittext"
android:layout_width="fill_parent"
android:layout_height="180dp"
android:layout_below="@id/umeng_socialize_share_titlebar"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="8dp"
android:background="#ffffff"
android:bufferType="spannable"
android:gravity="top"
android:hint="编辑分享内容"
android:lineSpacingExtra="3dp"
android:paddingBottom="10dp"
android:textColor="#000000"
android:textSize="15sp" />

<TextView
android:id="@+id/umeng_socialize_share_word_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignRight="@id/umeng_socialize_share_edittext"
android:background="#ffffff"
android:layout_below="@id/umeng_socialize_share_edittext"
android:paddingBottom="10dp"
android:paddingRight="15dp"
android:gravity="right"
android:singleLine="true"
android:textColor="#98999B"
android:textSize="14sp" />

<RelativeLayout
android:id="@+id/umeng_socialize_share_bottom_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/umeng_socialize_share_word_num"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#F2F5F6"
android:visibility="gone">
<RelativeLayout
android:layout_width="62dp"
android:layout_height="62dp"
android:layout_centerVertical="true"
android:layout_marginBottom="15dp"
android:layout_marginLeft="15dp"
android:id="@+id/umeng_image_edge"
android:layout_marginTop="15dp"
android:background="@drawable/umeng_socialize_edit_bg"
>
<ImageView
android:id="@+id/umeng_share_icon"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerInParent="true"
android:src="#2c3035" />
</RelativeLayout>
<TextView
android:layout_width="280dp"
android:id="@+id/umeng_web_title"
android:layout_toRightOf="@id/umeng_image_edge"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:textColor="#575A5C"
android:singleLine="true"
android:textSize="14sp"
android:visibility="gone"
android:layout_height="wrap_content" />

<ImageView
android:id="@+id/umeng_del"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignRight="@id/umeng_image_edge"
android:layout_alignTop="@id/umeng_image_edge"
android:layout_marginRight="-10dp"
android:layout_marginTop="-10dp"
android:background="@drawable/umeng_socialize_delete" />


</RelativeLayout>

</RelativeLayout>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="umeng_socialize_sharetosina">分享到新浪微博</string>
<string name="umeng_socialize_sharetodouban">分享到豆瓣</string>
<string name="umeng_socialize_sharetorenren">分享到人人网</string>

<string name="umeng_socialize_sharetotencent">分享到腾讯微博</string>
<string name="umeng_socialize_sharetotwitter">分享到twitter</string>
<string name="umeng_socialize_sharetolinkin">分享到领英</string>
</resources>
Loading

0 comments on commit d50405c

Please sign in to comment.