From 27bd1f81221b8c8e8047118a64c2beb7bc214bbb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 20 七月 2021 13:45:08 +0800
Subject: [PATCH] 木瓜接入布丸系统完成
---
MGVideo/src/com/mugua/mgvideo/ui/SplashActivity.java | 2
library-base/src/main/java/com/yeshi/base/entity/ad/AdPositionEnum.java | 3
MGVideo/src/com/mugua/mgvideo/util/ExitDialog.java | 4
MGVideo/AndroidManifest.xml | 19
MGVideo/res/layout/item_movie.xml | 1
library-video/src/main/res/values/colors.xml | 2
library-base/src/main/AndroidManifest.xml | 23
MGVideo/src/com/mugua/mgvideo/util/ConfigUtil.java | 1
library-video/src/main/java/com/yeshi/video/ui/EpisodeFragment.java | 4
MGVideo/res/layout/recommend_fragment.xml | 1
MGVideo/src/com/mugua/mgvideo/util/browser/MGJavaInterface.java | 2
MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsReviewPopupWindow.java | 2
MGVideo/src/com/mugua/mgvideo/ui/recommend/SearchActivity.java | 7
MGVideo/src/com/mugua/mgvideo/ui/video/VideoRecommendAdapter.java | 7
MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendNewAdapter.java | 2
library-video/src/main/java/com/yeshi/video/ui/VideoDetailActivity.java | 12
library-video/src/main/java/com/yeshi/video/ui/VideoEpisodeFragment.java | 6
MGVideo/src/com/mugua/mgvideo/ui/main/RecommendNewFragment.java | 8
MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsDetailActivity.java | 28
library-base/src/main/java/com/yeshi/base/utils/BeibeiConstant.java | 5
library-base/src/main/java/com/yeshi/base/utils/JumpActivityUtil.java | 6
MGVideo/src/com/mugua/mgvideo/MGVideoApplication.java | 9
MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendTopAdapter.java | 173 ++--
library-base/src/main/res/layout/activity_register.xml | 20
library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java | 21
library-search/src/main/res/drawable-xhdpi/icon_video_vip.png | 0
library-search/src/main/res/layout/item_video_search_result_video.xml | 1
library-search/src/main/res/values/style.xml | 2
MGVideo/src/com/mugua/mgvideo/ui/mine/SettingsActivity.java | 530 ++++++++--------
MGVideo/src/com/mugua/mgvideo/util/browser/BaseBWJavaInterface.java | 2
library-search/src/main/res/layout/item_video_search_result_album.xml | 11
library-base/src/main/java/com/yeshi/base/ui/BrowserActivity.java | 2
library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultAdapter.java | 4
MGVideo/src/com/mugua/mgvideo/ui/common/VideosFragment.java | 12
library-base/src/main/java/com/yeshi/base/ui/PersonInfoActivity.java | 2
library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultActivity.java | 9
library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java | 4
MGVideo/src/com/mugua/mgvideo/entity/HomeType.java | 1
library-base/src/main/java/com/yeshi/base/utils/RouteConstant.java | 2
MGVideo/res/values/strings.xml | 14
library-base/src/main/java/com/yeshi/base/utils/ad/TTAdManagerHolder.java | 4
library-common/src/com/lcjian/library/util/common/PackageUtils2.java | 8
library-search/src/main/res/layout/item_album_list_ad.xml | 10
library-search/src/main/res/drawable/shape_video_detail_episode_unselected.xml | 3
MGVideo/build.gradle | 25
MGVideo/res/layout/search_actvity.xml | 2
library-base/src/main/java/com/yeshi/base/ui/RegisterActivity.java | 607 +++++++++---------
library-base/src/main/res/layout/act_login.xml | 21
MGVideo/src/com/mugua/mgvideo/MGVideoAPI.java | 4
library-base/src/main/java/com/yeshi/base/ui/ForgetPwdActivity.java | 2
/dev/null | 182 -----
MGVideo/src/com/mugua/mgvideo/ui/main/MineFragment.java | 5
library-video/src/main/java/com/yeshi/video/ui/VideoPlayerFragment.java | 4
library-base/src/main/java/com/yeshi/base/ui/dialog/LoadingDialogUtil.java | 2
library-base/src/main/java/com/yeshi/base/utils/ad/GDTConstant.java | 3
library-search/src/main/res/values/colors.xml | 2
library-search/src/main/res/drawable/shape_video_detail_episode_selected.xml | 4
library-base/src/main/res/values/strings.xml | 4
58 files changed, 908 insertions(+), 948 deletions(-)
diff --git a/MGVideo/AndroidManifest.xml b/MGVideo/AndroidManifest.xml
index 40d8646..328c119 100644
--- a/MGVideo/AndroidManifest.xml
+++ b/MGVideo/AndroidManifest.xml
@@ -59,9 +59,7 @@
<activity
android:name=".ui.mine.SettingsActivity"
android:label="@string/app_name"></activity>
- <activity
- android:name=".ui.login.LoginActivity"
- android:label="@string/app_name"></activity>
+
<activity
android:name=".ui.mine.HelpAndTicklingActivity"
android:label="@string/app_name"></activity>
@@ -109,9 +107,7 @@
android:name=".ui.mine.BrowserActivity"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden|adjustResize"></activity>
- <activity
- android:name=".ui.login.ForgetPwdActivity"
- android:label="@string/app_name"></activity>
+
<activity
android:name=".ui.discover.GoodsDetailActivity"
android:label="@string/app_name"></activity>
@@ -121,12 +117,7 @@
<activity
android:name=".ui.discover.SpecificListActivity"
android:label="@string/app_name"></activity>
- <activity
- android:name=".ui.login.PersonInfoActivity"
- android:label="@string/app_name"></activity>
- <activity
- android:name=".ui.login.RegisterActivity"
- android:label="@string/app_name"></activity>
+
<activity
android:name=".ui.LinkPageActivity"
android:label="@string/app_name"></activity>
@@ -152,7 +143,7 @@
<!-- targetSDKVersion >= 24鏃舵墠闇�瑕佹坊鍔犺繖涓猵rovider銆俻rovider鐨刟uthorities灞炴�х殑鍊间负${applicationId}.fileprovider锛岃寮�鍙戣�呮牴鎹嚜宸辩殑${applicationId}鏉ヨ缃繖涓�硷紝渚嬪鏈緥涓璦pplicationId涓�"com.qq.e.union.demo"銆� -->
<provider
android:name="androidx.core.content.FileProvider"
- android:authorities="com.doudou.ysvideo.fileprovider"
+ android:authorities="com.mugua.mgvideo.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
@@ -197,7 +188,7 @@
android:value="2.5" />
<meta-data
android:name="UMENG_CHANNEL"
- android:value="GuanWang"></meta-data>
+ android:value="huawei"></meta-data>
<meta-data
diff --git a/MGVideo/build.gradle b/MGVideo/build.gradle
index 3982624..1ee7fab 100644
--- a/MGVideo/build.gradle
+++ b/MGVideo/build.gradle
@@ -31,7 +31,6 @@
implementation project(path: ':library-BaiduCPU')
-
//鍔犺浇鍔ㄧ敾搴�
implementation 'com.github.ybq:Android-SpinKit:1.4.0'
implementation project(path: ':library-base')
@@ -80,8 +79,8 @@
}
defaultConfig {
applicationId "com.mugua.mgvideo"
- versionCode 83
- versionName "2.4.3"
+ versionCode 84
+ versionName "2.4.4"
multiDexEnabled = true
ndk {
abiFilters "armeabi-v7a", "x86", "armeabi"
@@ -96,10 +95,24 @@
// manifestPlaceholders = [app_icon: "@drawable/app_icon",splashLayout:"activity_splash_ysdqjj"]
resValue "string", "app_name", "鏈ㄧ摐褰辫澶у叏"
- resValue "string", "agreement", "http://111.231.250.166/mugua/userAgreenment.html"
- resValue "string", "privacy", "http://111.231.250.166/mugua/privacyPolicy.html"
- resValue "string", "about_us_url", "http://111.231.250.166/mugua/aboutUs.html"
+ resValue "string", "agreement", "http://h5.mugua.yeshitv.com/user_protocol.html"
+ resValue "string", "privacy", "http://h5.mugua.yeshitv.com/privacy.html"
+ resValue "string", "about_us_url", "http://h5.mugua.yeshitv.com/abountOur/index.html"
manifestPlaceholders = [app_icon: "@drawable/ic_launcher", splashLayout: "activity_splash"]
+
+ //鏈ㄧ摐
+// resValue "string", "umeng_key", "55360d5b67e58eaf86002c0d"
+// resValue "string", "qq_id", "1104492673"
+// resValue "string", "qq_key", "AI6ri4IcDhsacEoP"
+// resValue "string", "ad_csj_app_id", "5123000"
+
+
+ //鍗庝负鏈ㄧ摐
+// resValue "string", "umeng_key", "56a1dfbe67e58e6bb10002a2"
+// resValue "string", "qq_id", ""
+// resValue "string", "qq_key", ""
+// resValue "string", "ad_csj_app_id", "5123000"
+
}
// productFlavors {
diff --git a/MGVideo/res/drawable/shape_video_detail_episode_selected.xml b/MGVideo/res/drawable/shape_video_detail_episode_selected.xml
deleted file mode 100644
index 60a7aa8..0000000
--- a/MGVideo/res/drawable/shape_video_detail_episode_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
-
- <solid android:color="#0051F5" />
- <corners android:radius="5dp" />
-
-
-</shape>
\ No newline at end of file
diff --git a/MGVideo/res/drawable/shape_video_detail_episode_unselected.xml b/MGVideo/res/drawable/shape_video_detail_episode_unselected.xml
deleted file mode 100644
index 86c74e8..0000000
--- a/MGVideo/res/drawable/shape_video_detail_episode_unselected.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/video_episode_bg_color" />
- <corners android:radius="5dp" />
-
-
-</shape>
\ No newline at end of file
diff --git a/MGVideo/res/layout/act_login.xml b/MGVideo/res/layout/act_login.xml
deleted file mode 100644
index 7e8cbfe..0000000
--- a/MGVideo/res/layout/act_login.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?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:background="@color/white"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:background="@color/top_bar_color" >
-
- <TextView
- android:id="@+id/login_tv_cancel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:drawableLeft="@drawable/ic_back"
- android:drawablePadding="3dp"
- android:gravity="center_vertical"
- android:padding="8dp"
- android:text="杩斿洖"
- android:textColor="@color/white"
- android:textSize="16sp" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:paddingBottom="6dp"
- android:paddingTop="6dp"
- android:text="甯愬彿鐧诲綍"
- android:textColor="@color/white"
- android:textSize="20sp" />
- </FrameLayout>
-
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <LinearLayout
- android:id="@+id/ll_login_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="50dp"
- android:layout_marginRight="50dp"
- android:layout_marginTop="50dp"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/iv_login_top"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:src="@drawable/ic_login_top" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="40dp"
- android:orientation="horizontal" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="璐﹀彿锛�" />
-
- <EditText
- android:id="@+id/et_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@null"
- android:digits="@string/rule_email"
- android:inputType="textEmailAddress"
- android:singleLine="true" />
- </LinearLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:layout_marginTop="6dp"
- android:background="@color/light_gray" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:orientation="horizontal" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瀵嗙爜锛�" />
-
- <EditText
- android:id="@+id/et_pwd"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@null"
- android:digits="@string/rule_password"
- android:inputType="textPassword"
- android:singleLine="true" />
- </LinearLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:layout_marginTop="6dp"
- android:background="@color/light_gray" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:layout_marginTop="10dp"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/cb_user_agreement"
- android:layout_width="15dp"
- android:layout_height="15dp"
- android:layout_gravity="center_vertical"
- android:background="@drawable/selector_user_agreement_checkbox"
- android:button="@null"
- android:checked="true"
- android:gravity="center" />
-
- <TextView
- android:id="@+id/tv_user_agreement"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_weight="1"
- android:text="@string/user_agreement"
- android:textColor="@color/blue4" />
-
- <TextView
- android:id="@+id/tv_forget_pwd"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="蹇樿瀵嗙爜锛�"
- android:textColor="@color/gray" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_marginTop="20dp"
- android:orientation="horizontal" >
-
- <TextView
- android:id="@+id/tv_register"
- android:layout_width="0dp"
- android:layout_height="38dp"
- android:layout_marginRight="5dp"
- android:layout_weight="1"
- android:background="@drawable/shape_register"
- android:gravity="center"
- android:text="娉ㄥ唽"
- android:textColor="@color/blue2" />
-
- <TextView
- android:id="@+id/tv_login"
- android:layout_width="0dp"
- android:layout_height="38dp"
- android:layout_marginLeft="5dp"
- android:layout_weight="1"
- android:background="@drawable/shape_login1"
- android:gravity="center"
- android:text="鐧婚檰"
- android:textColor="@color/white" />
- </LinearLayout>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="30dp"
- android:background="@color/white"
- android:orientation="vertical"
- android:paddingBottom="20dp" >
-
- <TextView
- android:id="@+id/textView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="30dp"
- android:gravity="center"
- android:text="绗笁鏂硅处鍙风櫥闄�"
- android:textColor="@color/gray"
- android:textSize="18sp" />
-
- <TextView
- android:id="@+id/login_tv_qq"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="15dp"
- android:drawablePadding="6dp"
- android:drawableTop="@drawable/img_qq"
- android:gravity="center_horizontal"
- android:padding="4dp"
- android:text="QQ鐧婚檰"
- android:textColor="@drawable/selector_qqblue_font"
- android:textSize="16sp" />
- </LinearLayout>
- </LinearLayout>
- </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/MGVideo/res/layout/activity_register.xml b/MGVideo/res/layout/activity_register.xml
deleted file mode 100644
index b24d117..0000000
--- a/MGVideo/res/layout/activity_register.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:background="@color/top_bar_color" >
-
- <TextView
- android:id="@+id/tv_back"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:drawableLeft="@drawable/ic_back"
- android:drawablePadding="3dp"
- android:gravity="center_vertical"
- android:padding="8dp"
- android:text="杩斿洖"
- android:textColor="@color/white"
- android:textSize="16sp" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:paddingBottom="6dp"
- android:paddingTop="6dp"
- android:text="娉ㄥ唽"
- android:textColor="@color/white"
- android:textSize="20sp" />
- </FrameLayout>
-
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <LinearLayout
- android:id="@+id/ll_login_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="50dp"
- android:layout_marginRight="50dp"
- android:layout_marginTop="50dp"
- android:gravity="center"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/iv_register_top"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:src="@drawable/ic_login_top" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
- android:orientation="horizontal" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center"
- android:text="閭:" />
-
- <EditText
- android:id="@+id/et_name"
- android:layout_width="match_parent"
- android:layout_height="30dp"
- android:background="@null"
- android:digits="@string/rule_email"
- android:inputType="textEmailAddress"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:singleLine="true"
- android:textSize="14sp" />
- </LinearLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:background="@color/light_gray" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:orientation="horizontal" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center"
- android:text="瀵嗙爜:" />
-
- <EditText
- android:id="@+id/et_pwd"
- android:layout_width="match_parent"
- android:layout_height="30dp"
- android:background="@null"
- android:digits="@string/rule_password"
- android:inputType="textPassword"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:singleLine="true"
- android:textSize="14sp" />
- </LinearLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:background="@color/light_gray" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:layout_marginTop="10dp"
- android:orientation="horizontal" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center"
- android:text="楠岃瘉鐮�:" />
-
- <EditText
- android:id="@+id/et_verfication_code"
- android:layout_width="0dp"
- android:layout_height="30dp"
- android:layout_weight="1"
- android:background="@null"
- android:digits="0123456789"
- android:inputType="number"
- android:paddingLeft="15dp"
- android:paddingRight="15dp"
- android:singleLine="true"
- android:textSize="14sp" />
-
- <TextView
- android:id="@+id/tv_obtain_verfication_code"
- android:layout_width="wrap_content"
- android:layout_height="30dp"
- android:layout_gravity="center_vertical"
- android:layout_marginLeft="20dp"
- android:background="@drawable/shape_get_verify_code"
- android:ellipsize="end"
- android:padding="5dp"
- android:singleLine="true"
- android:text="鑾峰彇楠岃瘉鐮�"
- android:textColor="@color/white" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_marginTop="8dp"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/cb_user_agreement"
- android:layout_width="15dp"
- android:layout_height="15dp"
- android:layout_gravity="center_vertical"
- android:background="@drawable/selector_user_agreement_checkbox"
- android:button="@null"
- android:checked="true"
- android:gravity="center" />
-
- <TextView
- android:id="@+id/tv_user_agreement"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:text="@string/user_agreement"
- android:textColor="@color/blue4" />
- </LinearLayout>
-
- <TextView
- android:id="@+id/tv_confirm"
- android:layout_width="match_parent"
- android:layout_height="38dp"
- android:layout_marginTop="50dp"
- android:background="@drawable/shape_login1"
- android:gravity="center"
- android:text="纭"
- android:textColor="@color/white" />
- </LinearLayout>
- </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/MGVideo/res/layout/item_movie.xml b/MGVideo/res/layout/item_movie.xml
index 1f708ab..84fb0fa 100644
--- a/MGVideo/res/layout/item_movie.xml
+++ b/MGVideo/res/layout/item_movie.xml
@@ -32,6 +32,7 @@
android:layout_width="29.5dp"
android:layout_height="17.5dp"
android:layout_gravity="top|right"
+ android:layout_marginRight="3dp"
android:src="@drawable/icon_video_vip" />
<ImageView
diff --git a/MGVideo/res/layout/recommend_fragment.xml b/MGVideo/res/layout/recommend_fragment.xml
index 8b2d270..a3fd616 100644
--- a/MGVideo/res/layout/recommend_fragment.xml
+++ b/MGVideo/res/layout/recommend_fragment.xml
@@ -59,6 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
+ android:visibility="gone"
android:src="@drawable/ic_red_point"></ImageView>
</FrameLayout>
</RelativeLayout>
diff --git a/MGVideo/res/layout/search_actvity.xml b/MGVideo/res/layout/search_actvity.xml
index 5290fea..66a8a2b 100644
--- a/MGVideo/res/layout/search_actvity.xml
+++ b/MGVideo/res/layout/search_actvity.xml
@@ -179,7 +179,7 @@
android:layout_height="wrap_content"
android:padding="6dp"
android:text="鐚滀綘鍠滄"
- android:visibility="visible" />
+ android:visibility="gone" />
<com.lcjian.library.widget.MyGridView
android:id="@+id/gv_video_guess_like"
diff --git a/MGVideo/res/values/strings.xml b/MGVideo/res/values/strings.xml
index 5d0aff4..7b0da48 100644
--- a/MGVideo/res/values/strings.xml
+++ b/MGVideo/res/values/strings.xml
@@ -1,9 +1,9 @@
<resources>
-<!-- <string name="app_name">鏈ㄧ摐褰辫澶у叏</string>-->
-<!-- <string name="agreement">http://111.231.250.166/mugua/userAgreenment.html</string>-->
-<!-- <string name="privacy">http://111.231.250.166/mugua/privacyPolicy.html</string>-->
-<!-- <string name="about_us_url">鏈ㄧ摐褰辫澶у叏</string>-->
+ <!-- <string name="app_name">鏈ㄧ摐褰辫澶у叏</string>-->
+ <!-- <string name="agreement">http://111.231.250.166/mugua/userAgreenment.html</string>-->
+ <!-- <string name="privacy">http://111.231.250.166/mugua/privacyPolicy.html</string>-->
+ <!-- <string name="about_us_url">鏈ㄧ摐褰辫澶у叏</string>-->
<string name="recommend">鎺ㄨ崘</string>
@@ -19,7 +19,7 @@
<string name="download_url">涓嬭浇閾炬帴</string>
<string name="my_score">鎴戠殑鎴愮哗</string>
<string name="my_accumulate">鎴戠殑绉垎</string>
- <string name="user_agreement">鐢ㄦ埛浣跨敤鍗忚&闅愮鏉℃</string>
+ <string name="user_agreement">鐢ㄦ埛浣跨敤鍗忚</string>
<string name="rule_email">0123456789abcdefghijklmnopqrstuvwxyz@.</string>
<string name="rule_password">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ`卢!"拢$%^*()~=#{}[];':,./?/*-_+<>@&</string>
<string name="share_to">鍒嗕韩杞欢</string>
@@ -85,5 +85,9 @@
<string name="review_edit">鎴戜篃鏉ヨ涓ゅ彞...</string>
<string name="review_deliver">鍙戣〃</string>
<string name="umeng_key">55360d5b67e58eaf86002c0d</string>
+ <string name="qq_id">1104492673</string>
+ <string name="qq_key">AI6ri4IcDhsacEoP</string>
+
+
</resources>
\ No newline at end of file
diff --git a/MGVideo/src/com/mugua/mgvideo/MGVideoAPI.java b/MGVideo/src/com/mugua/mgvideo/MGVideoAPI.java
index 6819b71..834bcf8 100644
--- a/MGVideo/src/com/mugua/mgvideo/MGVideoAPI.java
+++ b/MGVideo/src/com/mugua/mgvideo/MGVideoAPI.java
@@ -1268,7 +1268,7 @@
public static void commonGet(Context context, String url,
LinkedHashMap<String, String> params,
ResponseHandlerInterface handler, boolean asyn) {
- params.put("Package", context.getPackageName());
+ params.put("Package",PackageUtils2.getPackageName(context));
LinkedHashMap<String, String> map = validateParams(params, context);
RequestParams requestParams = new RequestParams(map);
@@ -1303,7 +1303,7 @@
private static void commonPost(Context context, String url,
LinkedHashMap<String, String> params, HashMap<String, File> files,
ResponseHandlerInterface handler, boolean asyn) {
- params.put("Package", "com.mugua.mgvideo");//context.getPackageName()
+ params.put("Package", PackageUtils2.getPackageName(context));//context.getPackageName()
int version = PackageUtils2.getVersionCode(context);
params.put("Version", version + "");
diff --git a/MGVideo/src/com/mugua/mgvideo/MGVideoApplication.java b/MGVideo/src/com/mugua/mgvideo/MGVideoApplication.java
index 0a91c8e..7788950 100644
--- a/MGVideo/src/com/mugua/mgvideo/MGVideoApplication.java
+++ b/MGVideo/src/com/mugua/mgvideo/MGVideoApplication.java
@@ -16,6 +16,7 @@
import com.funshion.playsdk.callback.FunshionPlayInitCallback;
import com.funshion.playsdk.register.IAuthCodeGetter;
import com.lcjian.library.util.ManifestDataUtil;
+import com.lcjian.library.util.common.PackageUtils2;
import com.mugua.mgvideo.util.CrashHandler;
import com.mugua.mgvideo.util.FunshionConstant;
import com.mugua.mgvideo.util.UserUtil;
@@ -66,7 +67,7 @@
// }
super.onCreate();
//鍚屾剰鐢ㄦ埛鍗忚
- if (UserUtil.isAgreeUserProtocol(this)) {
+ if (UserUtil.isAgreeUserProtocol(this) || BeibeiConstant.DEBUG) {
init(this);
}
}
@@ -93,7 +94,7 @@
});
// PlatformConfig.setWeixin(BeibeiConstant.WECHAT_ID,
// BeibeiConstant.WECHAT_KEY);
- PlatformConfig.setQQZone(BeibeiConstant.QQ_ID, BeibeiConstant.QQ_KEY);
+ PlatformConfig.setQQZone(application.getString(R.string.qq_id), application.getString(R.string.qq_key));
// PlatformConfig.setSinaWeibo(BeibeiConstant.SINA_ID,
// BeibeiConstant.SINA_KEY,
// "http://sns.whalecloud.com/sina2/callback");
@@ -171,7 +172,7 @@
public static String getVersionName(Context context) {
try {
PackageInfo pi = context.getPackageManager().getPackageInfo(
- context.getPackageName(), 0);
+ PackageUtils2.getPackageName(context), 0);
return pi.versionName;
} catch (NameNotFoundException e) {
e.printStackTrace();
@@ -209,7 +210,7 @@
*/
private static void initAd(Application application) {
TTAdManagerHolder.init(application);
- GDTADManager.getInstance().initWith(application, GDTConstant.GDT_APP_ID);
+ GDTADManager.getInstance().initWith(application, application.getString(R.string.ad_gdt_app_id));
}
diff --git a/MGVideo/src/com/mugua/mgvideo/entity/HomeType.java b/MGVideo/src/com/mugua/mgvideo/entity/HomeType.java
index 8d33f54..cef5edb 100644
--- a/MGVideo/src/com/mugua/mgvideo/entity/HomeType.java
+++ b/MGVideo/src/com/mugua/mgvideo/entity/HomeType.java
@@ -2,6 +2,7 @@
import com.google.gson.annotations.Expose;
import com.mugua.mgvideo.ui.category.bean.HotStar;
+import com.yeshi.base.entity.JumpDetail;
import com.yeshi.base.entity.video.VideoInfo;
import java.io.Serializable;
diff --git a/MGVideo/src/com/mugua/mgvideo/entity/JumpDetail.java b/MGVideo/src/com/mugua/mgvideo/entity/JumpDetail.java
deleted file mode 100644
index c73b821..0000000
--- a/MGVideo/src/com/mugua/mgvideo/entity/JumpDetail.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.mugua.mgvideo.entity;
-
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-
-/**
- * Created by weikou2015 on 2017/3/7.
- */
-
-public class JumpDetail implements Serializable {
- @Expose
- private String activity;
- @Expose
- private String id;
- @Expose
- private String name;
- @Expose
- private String type;
- @Expose
- private boolean needLogin;
- @Expose
- private String controller;
-
- public String getActivity() {
- return activity;
- }
-
- public void setActivity(String activity) {
- this.activity = activity;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getController() {
- return controller;
- }
-
- public void setController(String controller) {
- this.controller = controller;
- }
-
- public boolean isNeedLogin() {
- return needLogin;
- }
-
- public void setNeedLogin(boolean needLogin) {
- this.needLogin = needLogin;
- }
-}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/SplashActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/SplashActivity.java
index ca1a75e..bf35b65 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/SplashActivity.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/SplashActivity.java
@@ -371,7 +371,7 @@
public void run() {
toMainActivity();
}
- },2000);
+ }, 2000);
}
});
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/common/VideosFragment.java b/MGVideo/src/com/mugua/mgvideo/ui/common/VideosFragment.java
index d8874d7..73c11b3 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/common/VideosFragment.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/common/VideosFragment.java
@@ -27,6 +27,7 @@
import com.mugua.mgvideo.MGVideoAPI;
import com.mugua.mgvideo.R;
import com.mugua.mgvideo.ui.category.CategoryListAdapter;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.utils.BeibeiConstant;
import com.qq.e.ads.cfg.VideoOption;
import com.qq.e.ads.nativ.ADSize;
@@ -36,6 +37,7 @@
import com.umeng.analytics.MobclickAgent;
import com.yeshi.base.entity.video.VideoInfo;
import com.yeshi.base.entity.video.VideoType;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.GDTConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
@@ -131,7 +133,7 @@
@Override
public void onRefresh() {
mCurrentPage = 1;
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
loadAD();
} else {
getVideoList();
@@ -181,7 +183,7 @@
@Override
public void run() {
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
loadAD();
} else {
getVideoList();
@@ -227,7 +229,7 @@
mGridVideoAdapter.notifyDataSetChanged();
// 闇�瑕佹坊鍔犲箍鐐归�氬師鐢熷箍鍛婄殑鏃跺�欐墽琛屼互涓嬫潯浠惰鍙ワ紝鍚﹀垯鍙栨秷
if (videoInfos != null && videoInfos.size() == 30
- && BeibeiConstant.ADSHOW) {
+ && AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
loadAD();
}
if ((videoInfos == null || videoInfos.size() == 0)
@@ -269,7 +271,7 @@
mCurrentPage = 1;
view.findViewById(R.id.v_1).setVisibility(View.VISIBLE);
view.findViewById(R.id.v_2).setVisibility(View.GONE);
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
loadAD();
} else {
getVideoList();
@@ -281,7 +283,7 @@
mCurrentPage = 1;
view.findViewById(R.id.v_1).setVisibility(View.GONE);
view.findViewById(R.id.v_2).setVisibility(View.VISIBLE);
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
loadAD();
} else {
getVideoList();
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsDetailActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsDetailActivity.java
index b50abd4..cb90449 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsDetailActivity.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsDetailActivity.java
@@ -97,20 +97,20 @@
/*
* 璁＄畻鐘舵�佹爮楂樺害骞惰缃�
*/
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- Window window = getWindow();
- window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
- WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- int result = 0;
- int resourceId = getResources().getIdentifier("status_bar_height",
- "dimen", "android");
- if (resourceId > 0) {
- result = getResources().getDimensionPixelSize(resourceId);
- }
- FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
- FrameLayout.LayoutParams.MATCH_PARENT, result);
- findViewById(R.id.v_status_bar).setLayoutParams(params);
- }
+// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+// Window window = getWindow();
+// window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+// WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+// int result = 0;
+// int resourceId = getResources().getIdentifier("status_bar_height",
+// "dimen", "android");
+// if (resourceId > 0) {
+// result = getResources().getDimensionPixelSize(resourceId);
+// }
+// FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+// FrameLayout.LayoutParams.MATCH_PARENT, result);
+// findViewById(R.id.v_status_bar).setLayoutParams(params);
+// }
View topView = LayoutInflater.from(this).inflate(
R.layout.item_goods_detail_top, null);
View bottom = LayoutInflater.from(this).inflate(
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsReviewPopupWindow.java b/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsReviewPopupWindow.java
index 26ab25d..fc4f1aa 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsReviewPopupWindow.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/discover/GoodsReviewPopupWindow.java
@@ -26,11 +26,11 @@
import com.lcjian.library.util.common.StringUtils;
import com.mugua.mgvideo.R;
+import com.yeshi.base.ui.LoginActivity;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.mugua.mgvideo.MGVideoAPI;
import com.mugua.mgvideo.entity.GoodsComments;
import com.mugua.mgvideo.entity.UserInfo;
-import com.mugua.mgvideo.ui.login.LoginActivity;
import de.greenrobot.event.EventBus;
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/login/ForgetPwdActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/login/ForgetPwdActivity.java
deleted file mode 100644
index 56ed600..0000000
--- a/MGVideo/src/com/mugua/mgvideo/ui/login/ForgetPwdActivity.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.mugua.mgvideo.ui.login;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.regex.Matcher;
-
-import org.apache.http.Header;
-import org.json.JSONObject;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.lcjian.library.util.SingleToast;
-import com.lcjian.library.util.common.StringUtils;
-import com.mugua.mgvideo.R;
-import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.mugua.mgvideo.MGVideoAPI;
-import com.mugua.mgvideo.ui.BaseActivity;
-import com.mugua.mgvideo.util.IsEmail;
-
-/**
- * 蹇樿瀵嗙爜锛屼慨鏀瑰瘑鐮� Created by weikou2015 on 2016/10/27.
- */
-
-public class ForgetPwdActivity extends BaseActivity implements
- View.OnClickListener {
-
- private EditText et_email;
- private EditText et_verfication_code;
- private TextView tv_obtain_verfication_code;
- private EditText et_pwd;
- private TextView tv_confirm;
-
- @Override
- protected void onCreate(Bundle arg0) {
- super.onCreate(arg0);
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
- setContentView(R.layout.activity_forget_pwd);
- et_email = (EditText) findViewById(R.id.et_email);
- et_verfication_code = (EditText) findViewById(R.id.et_verfication_code);
- tv_obtain_verfication_code = (TextView) findViewById(R.id.tv_obtain_verfication_code);
- et_pwd = (EditText) findViewById(R.id.et_pwd);
- tv_confirm = (TextView) findViewById(R.id.tv_confirm);
-
- et_email.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- // et_email.getText().toString()
- if (!StringUtils.isEmpty(et_verfication_code.getText()
- .toString())
- && !StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
- if (!StringUtils.isEmpty(arg0.toString())) {
- tv_obtain_verfication_code.setBackground(getResources()
- .getDrawable(R.drawable.shape_login2));
- } else {
- tv_obtain_verfication_code.setBackground(getResources()
- .getDrawable(R.drawable.shape_login1));
- }
-
- }
- });
- et_verfication_code.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_email.getText().toString())
- && !StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
-
- }
- });
-
- et_pwd.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_verfication_code.getText()
- .toString())
- && !StringUtils.isEmpty(et_email.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
- }
- });
-
- tv_obtain_verfication_code.setOnClickListener(this);
- tv_confirm.setOnClickListener(this);
- findViewById(R.id.tv_back).setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.tv_obtain_verfication_code:
- String email = et_email.getText().toString();
- if (StringUtils.isEmpty(email)) {
- SingleToast.showToast(ForgetPwdActivity.this, "璇峰厛杈撳叆閭鍙�");
- return;
- } else {
- Matcher m = IsEmail.isEmailAddress().matcher(email);
- if (m.matches()) {
- getVerficationCode(email);
- } else {
- SingleToast.showToast(ForgetPwdActivity.this,
- "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
- return;
- }
- }
- break;
- case R.id.tv_confirm:
- String str = et_email.getText().toString();
- if (StringUtils.isEmpty(str)) {
- SingleToast.showToast(ForgetPwdActivity.this, "璇峰厛杈撳叆閭鍙�");
- return;
- } else {
- Matcher m = IsEmail.isEmailAddress().matcher(str);
- if (!m.matches()) {
- SingleToast.showToast(ForgetPwdActivity.this,
- "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
- return;
- }
- }
- if (StringUtils.isEmpty(et_pwd.getText().toString())) {
- SingleToast.showToast(ForgetPwdActivity.this, "瀵嗙爜涓嶈兘涓虹┖锛�");
- return;
- }
- if (et_pwd.getText().toString().length() < 6) {
- SingleToast.showToast(ForgetPwdActivity.this, "瀵嗙爜闀垮害涓嶈兘浣庝簬6浣嶏紒");
- return;
- }
- revisePwd();
- break;
- case R.id.tv_back:
- finish();
- break;
- }
- }
-
- Timer timer;
- int timecount = 59;
-
- /**
- * 淇敼瀵嗙爜
- */
- private void revisePwd() {
- SharedPreferences sp = getSharedPreferences("user",
- Context.MODE_PRIVATE);
- String uid = sp.getString("uid", "");
- MGVideoAPI.revisePwd(this, uid, et_email.getText().toString(),
- et_verfication_code.getText().toString(), et_pwd.getText()
- .toString(), new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SingleToast.showToast(ForgetPwdActivity.this,
- "淇敼瀵嗙爜鎴愬姛锛�");
- ForgetPwdActivity.this.finish();
- } else {
- SingleToast.showToast(ForgetPwdActivity.this,
- jsonObject.optString("Error") + "锛屼慨鏀瑰瘑鐮佸け璐ワ紒");
- }
- }
-
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers, responseString,
- throwable);
- SingleToast.showToast(ForgetPwdActivity.this, "淇敼瀵嗙爜澶辫触");
- }
- });
- }
-
- private void getVerficationCode(String email) {
- timer = new Timer();
- timer.schedule(new MyTask(), 1000, 1000);
- SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
- String uid = sp.getString("uid", "");
- MGVideoAPI.getVerficationCode(ForgetPwdActivity.this, uid, email,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SingleToast.showToast(ForgetPwdActivity.this,
- "鑾峰彇楠岃瘉鐮佹垚鍔燂紝璇锋墦寮�閭鏌ョ湅锛�");
- } else {
- SingleToast.showToast(ForgetPwdActivity.this,
- "鑾峰彇楠岃瘉鐮佸け璐�,璇烽噸鏂拌幏鍙栵紒");
- handler.sendEmptyMessage(1);
- }
- }
- });
- }
-
- class MyTask extends TimerTask {
- @Override
- public void run() {
- if (timecount > 0) {
- handler.sendEmptyMessage(0);
- } else {
- handler.sendEmptyMessage(1);
- }
- }
- }
-
- Handler handler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- switch (msg.what) {
- case 0:
- tv_obtain_verfication_code.setClickable(false);
- tv_obtain_verfication_code.setText("閲嶆柊鍙戦��(" + timecount + "s)");
- timecount--;
- break;
- case 1:
- timer.cancel();
- tv_obtain_verfication_code.setText("鑾峰彇楠岃瘉鐮�");
- tv_obtain_verfication_code.setClickable(true);
- timecount = 59;
- break;
- }
- }
- };
-}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/login/LoginActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/login/LoginActivity.java
deleted file mode 100644
index 6073ed4..0000000
--- a/MGVideo/src/com/mugua/mgvideo/ui/login/LoginActivity.java
+++ /dev/null
@@ -1,529 +0,0 @@
-package com.mugua.mgvideo.ui.login;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.http.Header;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.lcjian.library.util.SingleToast;
-import com.lcjian.library.util.common.StringUtils;
-import com.mugua.mgvideo.R;
-import com.umeng.analytics.MobclickAgent;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.mugua.mgvideo.MGVideoAPI;
-import com.mugua.mgvideo.ui.BaseActivity;
-import com.mugua.mgvideo.ui.mine.BrowserActivity;
-import com.yeshi.base.utils.BeibeiConstant;
-import com.mugua.mgvideo.util.XGPush;
-
-public class LoginActivity extends BaseActivity implements OnClickListener {
- // private Tencent mTencent;
- public static final int RESULT_LOGIN = 10;
- // private UserInfo mInfo;
- private ProgressDialog dialog;
- private TextView tv_qq;
- private TextView tv_cancel;// 鍙栨秷
- private boolean isTouchLogin;// 鐢ㄦ埛鏄惁鐐瑰嚮鐧诲綍
- private String uid;
- // private IUiListener listener;// 鐢ㄤ簬鎺ユ敹杩斿洖鏁版嵁鐨勭洃鍚�
- private String loginType = "";// 鐧诲綍绫诲瀷 榛樿涓虹┖瀛楃 QQ涓�1
- private String openId = "";// 鐢ㄦ埛绗笁鏂圭櫥褰曞敮涓�璇嗗埆鐮�
-
- private LinearLayout ll_login_content;
- private ImageView iv_login_top;
- private EditText et_name;
- private EditText et_pwd;
- private CheckBox cb_user_agreement;
- private TextView tv_forget_pwd;
- private TextView tv_register;
- private TextView tv_login;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.act_login);
- uid = getSharedPreferences("user", Context.MODE_PRIVATE).getString(
- "uid", "");
- tv_cancel = (TextView) findViewById(R.id.login_tv_cancel);
- tv_qq = (TextView) findViewById(R.id.login_tv_qq);
-
- tv_cancel.setOnClickListener(this);
- tv_qq.setOnClickListener(this);
- dialog = new ProgressDialog(this);
- ll_login_content = (LinearLayout) findViewById(R.id.ll_login_content);
- iv_login_top = (ImageView) findViewById(R.id.iv_login_top);
-
- int w = View.MeasureSpec.makeMeasureSpec(0,
- View.MeasureSpec.UNSPECIFIED);
- int h = View.MeasureSpec.makeMeasureSpec(0,
- View.MeasureSpec.UNSPECIFIED);
- ll_login_content.measure(w, h);
- int width = ll_login_content.getMeasuredWidth();
- LayoutParams params = new LinearLayout.LayoutParams(width,
- (int) (width * 0.434));
- params.gravity = Gravity.CENTER_HORIZONTAL;
- iv_login_top.setLayoutParams(params);
-
- et_name = (EditText) findViewById(R.id.et_name);
- et_pwd = (EditText) findViewById(R.id.et_pwd);
- et_name.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_login.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_login.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
-
- }
- });
- et_pwd.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_login.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_login.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
- }
- });
- cb_user_agreement = (CheckBox) findViewById(R.id.cb_user_agreement);
- tv_forget_pwd = (TextView) findViewById(R.id.tv_forget_pwd);
- tv_register = (TextView) findViewById(R.id.tv_register);
- tv_login = (TextView) findViewById(R.id.tv_login);
- tv_forget_pwd.setOnClickListener(this);
- tv_register.setOnClickListener(this);
- tv_login.setOnClickListener(this);
- findViewById(R.id.tv_user_agreement).setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.login_tv_cancel:// 鍙栨秷
- finish();
- break;
- case R.id.login_tv_qq:// QQ鐧诲綍
- if (isQQClientAvailable()) {
- loginType = "1";
- // qq鐧诲綍閫昏緫澶勭悊 鐐瑰嚮鐧诲綍鍚庨渶瑕佹殏鏃堕攣瀹氳繑鍥為敭鍜岃繑鍥炲姛鑳� 涓嶇劧浼氭姤閿�
- lockBack(true);
- UMShareAPI.get(LoginActivity.this).getPlatformInfo(LoginActivity.this, SHARE_MEDIA.QQ, authListener);
- } else {
- Toast.makeText(LoginActivity.this, "QQ涓嶅彲鐢紝璇锋煡璇㈡墜鏈烘槸鍚﹀畨瑁匭Q...", Toast.LENGTH_LONG).show();
- }
- break;
- case R.id.tv_forget_pwd:
- startActivity(new Intent(LoginActivity.this,
- ForgetPwdActivity.class));
- break;
- case R.id.tv_user_agreement:
- Intent intent = new Intent(LoginActivity.this,
- BrowserActivity.class);
- intent.putExtra("url", getString(R.string.agreement));
- startActivity(intent);
- break;
- case R.id.tv_register:
- startActivity(new Intent(LoginActivity.this, RegisterActivity.class));
- break;
- case R.id.tv_login:
- if (cb_user_agreement.isChecked())
- emailLogin();
- else
- SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚鍚庢柟鍙櫥闄�");
- break;
- }
- }
-
- /**
- * 鍒ゆ柇qq鏄惁鍙敤
- */
- public boolean isQQClientAvailable() {
- final PackageManager packageManager = getPackageManager();
- List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);
- if (pinfo != null) {
- for (int i = 0; i < pinfo.size(); i++) {
- String pn = pinfo.get(i).packageName;
- if (pn.equals("com.tencent.mobileqq")) {
- return true;
- }
- }
- }
- return false;
- }
-
-
- UMAuthListener authListener = new UMAuthListener() {
- @Override
- public void onStart(SHARE_MEDIA platform) {
- dialog.show();
- }
-
- @Override
- public void onComplete(SHARE_MEDIA platform, int action,
- final Map<String, String> data) {
- dialog.dismiss();
- Log.i("mResult", "杩斿洖鐨勬暟鎹负----" + data);
- MGVideoAPI.userLogin(LoginActivity.this, uid, data.get("name"),
- data.get("openid"), data.get("iconurl"),
- data.get("gender"), data.get("province"), data.get("city"),
- loginType, new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- Log.i("mResult", "涓婁紶鏁版嵁鍒版湇鍔″櫒鎴愬姛锛�");
- // SingleToast.showToast(LoginActivity.this,
- // "鏁版嵁涓婁紶鎴愬姛!");
- // 鍐欏叆sharedpreference
- Editor edit = getSharedPreferences("user",
- Context.MODE_PRIVATE).edit();
- edit.putString("portrait", data.get("iconurl"));
- edit.putString("LoginUid", jsonObject
- .getJSONObject("Data")
- .getString("LoginUid"));
- edit.putString("name", data.get("name"));
- edit.putString("sex", data.get("gender"));
- edit.commit();
-
- SingleToast.showToast(LoginActivity.this, "鐧诲綍鎴愬姛");
- XGPush.registerPush(LoginActivity.this);
- finish();
- }
-
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers,
- responseString, throwable);
- SingleToast.showToast(LoginActivity.this, "鐧诲綍澶辫触");
- // Log.i("mResult", "涓婁紶鏁版嵁鍒版湇鍔″櫒鎴愬姛锛�");
- }
-
- @Override
- public void onFinish() {
- super.onFinish();
- dialog.dismiss();
- }
- });
- }
-
- @Override
- public void onError(SHARE_MEDIA platform, int action, Throwable t) {
- lockBack(false);
- dialog.dismiss();
- Toast.makeText(LoginActivity.this, "澶辫触锛�" + t.getMessage(),
- Toast.LENGTH_LONG).show();
- }
-
- @Override
- public void onCancel(SHARE_MEDIA platform, int action) {
- lockBack(false);
- dialog.dismiss();
- Toast.makeText(LoginActivity.this, "鍙栨秷浜�", Toast.LENGTH_LONG).show();
- }
- };
-
- /**
- * Email鐧婚檰
- */
- private void emailLogin() {
- SharedPreferences preferences = getSharedPreferences("user",
- MODE_PRIVATE);
- String uid = preferences.getString("uid", "");
- String name = et_name.getText().toString();
- String pwd = et_pwd.getText().toString();
- if (StringUtils.isEmpty(name) || StringUtils.isEmpty(pwd)) {
- SingleToast.showToast(this, "璐﹀彿鎴栧瘑鐮佷负绌猴紒");
- return;
- }
- SingleToast.showToast(this, "寮�濮嬬櫥闄嗕簡");
- MGVideoAPI.emailLogin(this, uid, name, pwd,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- Log.i("mResult",
- "鐧婚檰鍚庤繑鍥炵殑鍊间负锛�" + jsonObject.toString());
- SharedPreferences sp = getSharedPreferences("user",
- MODE_PRIVATE);
- Editor edit = sp.edit();
- edit.putString("portrait", jsonObject
- .optJSONObject("Data")
- .optString("Portrait"));
- edit.putString("LoginUid", jsonObject
- .getJSONObject("Data").getString("Id"));
- edit.putString(
- "name",
- jsonObject.optJSONObject("Data").optString(
- "Nickname"));
- edit.commit();
- SingleToast.showToast(LoginActivity.this, "鐧婚檰鎴愬姛"
- + "鏄电О涓�:"
- + jsonObject.optJSONObject("Data")
- .optString("Nickname"));
- finish();
- } else {
- SingleToast.showToast(LoginActivity.this, "鐧婚檰澶辫触");
- }
- }
-
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers, responseString,
- throwable);
- SingleToast.showToast(LoginActivity.this, "鐧婚檰澶辫触");
- }
- });
-
- }
-
- @Override
- public void onResume() {
- super.onResume();
- if (!StringUtils.isEmpty(getSharedPreferences("user",
- Context.MODE_PRIVATE).getString("LoginUid", ""))) {
- finish();
- }
- MobclickAgent.onPageStart("鐧婚檰椤�");
- }
-
- @Override
- public void onPause() {
- super.onPause();
- MobclickAgent.onPageEnd("鐧婚檰椤�");
- }
-
- /**
- * 閿佸畾杩斿洖
- */
- private void lockBack(boolean isSure) {
- tv_cancel.setEnabled(!isSure);
- isTouchLogin = isSure;
-
- }
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (isTouchLogin && keyCode == KeyEvent.KEYCODE_BACK) {
- return false;
- }
- return super.onKeyDown(keyCode, event);
- }
-
- // class BaseUiListener implements IUiListener {
- //
- // @Override
- // public void onCancel() {
- // lockBack(false);
- // SingleToast.showToast(LoginActivity.this, "鍙栨秷鐧诲綍");
- // }
- //
- // @Override
- // public void onComplete(Object arg0) {
- // lockBack(false);
- // // V2.0鐗堟湰锛屽弬鏁扮被鍨嬬敱JSONObject 鏀规垚浜哋bject,鍏蜂綋绫诲瀷鍙傝�僡pi鏂囨。
- // dialog = ProgressDialog.show(LoginActivity.this, "", "姝ｅ湪鐧诲綍...");
- // Log.i("mResult", "鐧婚檰璇锋眰鎴愬姛锛�");
- // updateUserInfo();
- // }
- //
- // @Override
- // public void onError(UiError arg0) {
- // lockBack(false);
- // SingleToast.showToast(LoginActivity.this, "鐧诲綍澶辫触锛岃閲嶈瘯");
- // }
- // }
- //
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
- }
-
- //
- // private void updateUserInfo() {
- // if (mTencent != null && mTencent.isSessionValid()) {
- // listener = new IUiListener() {
- // @Override
- // public void onError(UiError e) {
- // Log.i("mResult", "鐧婚檰閿欒锛�");
- // // SingleToast.showToast(LoginActivity.this, "绗笁鏂圭櫥闄嗗け璐�!");
- // dialog.dismiss();
- // }
- //
- // @Override
- // public void onComplete(Object response) {
- // // SingleToast.showToast(LoginActivity.this, "绗笁鏂圭櫥闄嗘垚鍔�!");
- // JSONObject object = (JSONObject) response;
- // Log.i("mResult", "鐧婚檰瀹屾垚锛�" + response);
- // if (object.has("openid")) {// 绗竴姝ワ紝鑾峰彇鐢ㄦ埛鍞竴璇嗗埆鐮�
- // try {
- // openId = object.getString("openid");
- // mInfo.getUserInfo(listener);
- // } catch (JSONException e) {
- // e.printStackTrace();
- // }
- // }
- // // 绗簩姝ユ墠鎵ц澶村儚绛変俊鎭殑鑾峰彇
- // if (object.has("nickname")) {// 鐢ㄦ埛鍩烘湰淇℃伅锛氬ご鍍� 鏄电О
- // // SingleToast.showToast(LoginActivity.this, "鏈塶ickName,鍗冲皢杩涘叆handler");
- // Message msg = new Message();
- // msg.obj = response;
- // msg.what = 0;
- // mHandler.sendMessage(msg);
- // }else{
- // // SingleToast.showToast(LoginActivity.this, "娌℃湁鏈塶ickName");
- // dialog.dismiss(); }
- // }
- //
- // @Override
- // public void onCancel() {
- //
- // }
- // };
- // mInfo = new UserInfo(this, mTencent.getQQToken());
- // mInfo.getOpenId(listener);
- // } else {
- // SingleToast.showToast(LoginActivity.this, "鏆傛椂鏃犳硶鐧婚檰!");
- // Log.i("mResult", "鏆傛椂鏃犳硶鐧婚檰锛�");
- // dialog.dismiss();
- // }
- // }
-
- Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == 0) {
- final JSONObject response = (JSONObject) msg.obj;
- try {
- Log.i("mResult",
- "澶村儚璺緞锛�----" + response.getString("figureurl_qq_2"));
- // SingleToast.showToast(LoginActivity.this,
- // "绗笁鏂圭櫥闄嗘垚鍔�,寮�濮嬩笂浼犳暟鎹�!");
- MGVideoAPI.userLogin(LoginActivity.this, uid,
- response.getString("nickname"), openId,
- response.getString("figureurl_qq_2"),
- response.getString("gender"),
- response.getString("province"),
- response.getString("city"), loginType,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- Log.i("mResult", "涓婁紶鏁版嵁鍒版湇鍔″櫒鎴愬姛锛�");
- // SingleToast.showToast(LoginActivity.this,
- // "鏁版嵁涓婁紶鎴愬姛!");
- // 鍐欏叆sharedpreference
- Editor edit = getSharedPreferences("user",
- Context.MODE_PRIVATE).edit();
- edit.putString("portrait", response
- .getString("figureurl_qq_2"));
- edit.putString("LoginUid",
- jsonObject.getJSONObject("Data")
- .getString("LoginUid"));
- edit.putString("name",
- response.getString("nickname"));
- edit.putString("sex",
- response.getString("gender"));
- edit.commit();
-
- SingleToast.showToast(LoginActivity.this,
- "鐧诲綍鎴愬姛");
- XGPush.registerPush(LoginActivity.this);
- finish();
- }
-
- @Override
- public void onFailure(int statusCode,
- Header[] headers,
- String responseString,
- Throwable throwable) {
- super.onFailure(statusCode, headers,
- responseString, throwable);
- SingleToast.showToast(LoginActivity.this,
- "鐧诲綍澶辫触");
- // Log.i("mResult", "涓婁紶鏁版嵁鍒版湇鍔″櫒鎴愬姛锛�");
- }
-
- @Override
- public void onFinish() {
- super.onFinish();
- dialog.dismiss();
- }
- });
- } catch (JSONException e) {
- e.printStackTrace();
- }
- }
- }
- };
-}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/login/PersonInfoActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/login/PersonInfoActivity.java
deleted file mode 100644
index f9b5045..0000000
--- a/MGVideo/src/com/mugua/mgvideo/ui/login/PersonInfoActivity.java
+++ /dev/null
@@ -1,383 +0,0 @@
-package com.mugua.mgvideo.ui.login;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.util.Base64;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.DatePicker;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.lcjian.library.util.Environment;
-import com.lcjian.library.util.SingleToast;
-import com.lcjian.library.util.common.StringUtils;
-import com.mugua.mgvideo.R;
-import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.mugua.mgvideo.MGVideoAPI;
-import com.mugua.mgvideo.ui.BaseActivity;
-import com.yeshi.base.utils.BeibeiConstant;
-import com.mugua.mgvideo.util.GlideCircleTransform;
-import com.mugua.mgvideo.util.SelectPicUtil;
-
-import org.apache.http.Header;
-import org.json.JSONObject;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Calendar;
-
-/**
- * Created by weikou2015 on 2016/10/27.
- */
-
-public class PersonInfoActivity extends BaseActivity implements View.OnClickListener {
-
- private LinearLayout ll_portrait;
- private LinearLayout ll_nickName;
- private LinearLayout ll_birthday;
- private LinearLayout ll_sex;
- private LinearLayout ll_autograph;
-
- private ImageView iv_portrait;
- private TextView tv_nickName;
- private TextView tv_birthday;
- private TextView tv_sex;
- private TextView tv_autograph;
-
- @Override
- protected void onCreate(Bundle arg0) {
- super.onCreate(arg0);
- setContentView(R.layout.activity_person_info);
- ll_portrait = (LinearLayout) findViewById(R.id.ll_portrait_select);
- ll_nickName = (LinearLayout) findViewById(R.id.ll_nickName);
- ll_birthday = (LinearLayout) findViewById(R.id.ll_birthday);
- ll_sex = (LinearLayout) findViewById(R.id.ll_sex);
- ll_autograph = (LinearLayout) findViewById(R.id.ll_autograph);
- iv_portrait = (ImageView) findViewById(R.id.iv_portrai_select);
- tv_nickName = (TextView) findViewById(R.id.tv_nickName);
- tv_birthday = (TextView) findViewById(R.id.tv_birthday);
- tv_sex = (TextView) findViewById(R.id.tv_sex);
- tv_autograph = (TextView) findViewById(R.id.tv_autograph);
-
- ll_portrait.setOnClickListener(this);
- ll_nickName.setOnClickListener(this);
- ll_birthday.setOnClickListener(this);
- ll_sex.setOnClickListener(this);
- ll_autograph.setOnClickListener(this);
- findViewById(R.id.tv_back).setOnClickListener(this);
- findViewById(R.id.tv_top_right).setOnClickListener(this);
- getPersonInfo();
- }
-
- private void getPersonInfo() {
- SharedPreferences sp = getSharedPreferences("user", Context.MODE_PRIVATE);
- String loginUid = sp.getString("LoginUid", "");
- String uid = sp.getString("uid", "");
- MGVideoAPI.getPersonInfo(this, uid, loginUid, new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- Glide.with(PersonInfoActivity.this).load(BeibeiConstant.addPreFix(jsonObject.optJSONObject("Data").optString("Portrait"))).placeholder(R.drawable.ic_portrait_default).error(R.drawable.ic_portrait_default).into(iv_portrait);
- tv_nickName.setText(jsonObject.optJSONObject("Data").optString("Nickname"));
- tv_birthday.setText(jsonObject.optJSONObject("Data").optString("Birthday"));
- tv_sex.setText(Integer.parseInt(jsonObject.optJSONObject("Data").optString("Sex")) == 0 ? "濂�" : "鐢�");
- tv_autograph.setText(jsonObject.optJSONObject("Data").optString("Sign"));
- }
- }
- });
- }
-
- String imgBase64 = "";
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- // TODO Auto-generated method stub
- super.onActivityResult(requestCode, resultCode, data);
- if (resultCode == Activity.RESULT_OK) {
- Bitmap bm = null;
- bm = SelectPicUtil.onActivityResult(this, requestCode,
- resultCode, data, imgWidth, imgHeight, imgWidth,
- imgHeight);
-
- if (bm != null) {
- if (bm.getByteCount() / 1024 > maxSize) {
- bm = compressImage(bm);
- }
- String path = saveBitmapTofile(bm);
- final File file = new File(path);
- if (!file.exists()) {
- return;
- }
- imgBase64 = bitmapToBase64(bm);
- Log.i("mresult", "鍥剧墖璺姴涓�:" + path + "----requestcode:" + requestCode);
- Glide.with(PersonInfoActivity.this).load(file).transform(new GlideCircleTransform(PersonInfoActivity.this)).into(iv_portrait);
-
- }
- }
- }
-
- private String bitmapToBase64(Bitmap bitmap) {
-
- String result = null;
- ByteArrayOutputStream baos = null;
- try {
- if (bitmap != null) {
- baos = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos);
-
- baos.flush();
- baos.close();
-
- byte[] bitmapBytes = baos.toByteArray();
- result = Base64.encodeToString(bitmapBytes, Base64.DEFAULT);
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- if (baos != null) {
- baos.flush();
- baos.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return result;
- }
-
- private String saveBitmapTofile(Bitmap bm) {
- String name = "img.png";
- File fDir = new File(Environment.getExternalStorageDirectory() + "");
- if (!fDir.exists()) {
- fDir.mkdir();
- }
- File picFile = new File(fDir, name);
- try {
- FileOutputStream out = new FileOutputStream(picFile);
- bm.compress(Bitmap.CompressFormat.PNG, 100, out);
- out.flush();
- out.close();
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return picFile.getPath();
- }
-
- @SuppressLint("SdCardPath")
-
- private int imgWidth = 400;
-
- private int imgHeight = 400;
-
- private int maxSize = 300;
-
- /*
- * 鍘嬬缉鍥剧墖
- */
- private Bitmap compressImage(Bitmap image) {
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- image.compress(Bitmap.CompressFormat.JPEG, 100, baos);// 璐ㄩ噺鍘嬬缉鏂规硶锛岃繖閲�100琛ㄧず涓嶅帇缂╋紝鎶婂帇缂╁悗鐨勬暟鎹瓨鏀惧埌baos涓�
- int options = 100;
- while (baos.toByteArray().length / 1024 > maxSize) { // 寰幆鍒ゆ柇濡傛灉鍘嬬缉鍚庡浘鐗囨槸鍚﹀ぇ浜�100kb,澶т簬缁х画鍘嬬缉
- baos.reset();// 閲嶇疆baos鍗虫竻绌篵aos
- image.compress(Bitmap.CompressFormat.JPEG, options, baos);// 杩欓噷鍘嬬缉options%锛屾妸鍘嬬缉鍚庣殑鏁版嵁瀛樻斁鍒癰aos涓�
- options -= 10;// 姣忔閮藉噺灏�10
- }
- ByteArrayInputStream isBm = new ByteArrayInputStream(baos.toByteArray());// 鎶婂帇缂╁悗鐨勬暟鎹産aos瀛樻斁鍒癇yteArrayInputStream涓�
- Bitmap bitmap = BitmapFactory.decodeStream(isBm, null, null);// 鎶夿yteArrayInputStream鏁版嵁鐢熸垚鍥剧墖
- return bitmap;
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.tv_back:
- finish();
- break;
- case R.id.ll_portrait_select:
- SelectPicUtil.getByAlbum(PersonInfoActivity.this);
- break;
- case R.id.ll_nickName:
- getNickName();
- break;
- case R.id.ll_birthday:
- getDate();
- break;
- case R.id.ll_sex:
- getSex();
- break;
- case R.id.ll_autograph://涓�х鍚�
- getAutograph();
- break;
- case R.id.tv_top_right://瀹屾垚涓汉淇℃伅鐨勪慨鏀�
- upLoadRegisterData();
- break;
- }
- }
-
- /**
- * 涓婁紶涓汉淇℃伅
- */
- private void upLoadRegisterData() {
- SharedPreferences sp = getSharedPreferences("user", Context.MODE_PRIVATE);
- String uid = sp.getString("uid", "");
- String loginUid = sp.getString("LoginUid", "");
- MGVideoAPI.upLoadPersonInfo(this, uid, loginUid, mSex + "", tv_birthday.getText().toString(),
- tv_autograph.getText().toString(), imgBase64, tv_nickName.getText().toString(), new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SharedPreferences sharedPreferences = getSharedPreferences("user", Context.MODE_PRIVATE);
- SharedPreferences.Editor editor = sharedPreferences.edit();
- editor.putString("name", tv_nickName.getText().toString());
- editor.commit();
-
- SingleToast.showToast(PersonInfoActivity.this, "涓汉淇℃伅鏇存柊鎴愬姛");
- finish();
- }
- }
- });
- }
-
- private int mSex = 0;
-
- private void getSex() {
- final String sex[] = new String[]{"濂�", "鐢�"};
- new AlertDialog.Builder(this).setTitle("鎬у埆閫夋嫨").setSingleChoiceItems(
- sex, 0, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- mSex = which;
- }
- })
- .setPositiveButton("纭畾", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Log.i("mResult", "which鐨勫�间负锛�" + which);
- tv_sex.setText(sex[mSex]);
- dialog.dismiss();
- }
- })
- .setNegativeButton("鍙栨秷", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- }
- }).show();
- }
-
- private void getAutograph() {
- View v = LayoutInflater.from(this).inflate(R.layout.item_edit_dialog, null);
- final AlertDialog alertDialog = new AlertDialog.Builder(PersonInfoActivity.this).setView(v).create();
- alertDialog.show();
- TextView tv_title = (TextView) v.findViewById(R.id.tv_dialog_title);
- tv_title.setText("涓�х鍚�");
- final EditText et_msg = (EditText) v.findViewById(R.id.et_dialog_message);
- TextView tv_cancel = (TextView) v.findViewById(R.id.tv_cancel);
- TextView tv_confirm = (TextView) v.findViewById(R.id.tv_confirm);
- tv_cancel.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- alertDialog.dismiss();
- }
- });
-
- tv_confirm.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String str = et_msg.getText().toString();
- if (StringUtils.isEmpty(str)) {
- SingleToast.showToast(PersonInfoActivity.this, "涓�х鍚嶄笉鑳戒负绌�");
- return;
- } else {
- tv_autograph.setText(str);
- alertDialog.dismiss();
- }
- }
- });
-
- }
-
- private void getNickName() {
- final EditText et_msg = new EditText(this);
- AlertDialog alertDialog = new AlertDialog.Builder(PersonInfoActivity.this).setView(et_msg).setTitle("鏄电О淇敼")
- .setPositiveButton("纭畾", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- String str = et_msg.getText().toString();
- if (StringUtils.isEmpty(str)) {
- SingleToast.showToast(PersonInfoActivity.this, "鏄电О涓嶈兘涓虹┖");
- } else {
- tv_nickName.setText(str);
- dialog.dismiss();
- }
- }
- }).setNegativeButton("鍙栨秷", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- }
- }).create();
- alertDialog.show();
- }
-
- /**
- * 鑾峰彇鐢熸棩
- */
- String date = "";
-
- private void getDate() {
- View view = LayoutInflater.from(this).inflate(R.layout.item_datepicker, null);
- final AlertDialog alertDialog = new AlertDialog.Builder(PersonInfoActivity.this).setView(view).create();
- alertDialog.show();
- DatePicker datePicker = (DatePicker) view.findViewById(R.id.datePicker);
- TextView tv_cancel = (TextView) view.findViewById(R.id.tv_cancel);
- final TextView tv_confirm = (TextView) view.findViewById(R.id.tv_confirm);
-
- Calendar calendar = Calendar.getInstance();
- int year = calendar.get(Calendar.YEAR);
- int monthOfYear = calendar.get(Calendar.MONTH);
- int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
- date = year + "/" + monthOfYear + "/" + dayOfMonth;
- datePicker.init(year, monthOfYear, dayOfMonth, new DatePicker.OnDateChangedListener() {
- @Override
- public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
- date = year + "/" + (monthOfYear + 1) + "/" + dayOfMonth;
- }
- });
- tv_cancel.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- alertDialog.dismiss();
- }
- });
- tv_confirm.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- tv_birthday.setText(date);
- alertDialog.dismiss();
- }
- });
- }
-}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/login/RegisterActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/login/RegisterActivity.java
deleted file mode 100644
index c2b425a..0000000
--- a/MGVideo/src/com/mugua/mgvideo/ui/login/RegisterActivity.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package com.mugua.mgvideo.ui.login;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.regex.Matcher;
-
-import org.apache.http.Header;
-import org.json.JSONObject;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.lcjian.library.util.SingleToast;
-import com.lcjian.library.util.common.StringUtils;
-import com.mugua.mgvideo.R;
-import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.mugua.mgvideo.MGVideoAPI;
-import com.mugua.mgvideo.ui.BaseActivity;
-import com.mugua.mgvideo.ui.mine.BrowserActivity;
-import com.yeshi.base.utils.BeibeiConstant;
-import com.mugua.mgvideo.util.IsEmail;
-
-/**
- * Created by weikou2015 on 2016/10/27.
- */
-
-public class RegisterActivity extends BaseActivity implements
- View.OnClickListener {
-
- private LinearLayout ll_login_content;
- private ImageView iv_register_top;
- private EditText et_email;
- private EditText et_pwd;
- private EditText et_verfication_code;
- private TextView tv_obtain_verfication_code;
- private CheckBox cb_user_agreement;
- private TextView tv_confirm;
-
- @Override
- protected void onCreate(Bundle arg0) {
- super.onCreate(arg0);
- setContentView(R.layout.activity_register);
- iv_register_top = (ImageView) findViewById(R.id.iv_register_top);
- et_email = (EditText) findViewById(R.id.et_name);
- et_pwd = (EditText) findViewById(R.id.et_pwd);
- et_verfication_code = (EditText) findViewById(R.id.et_verfication_code);
- tv_obtain_verfication_code = (TextView) findViewById(R.id.tv_obtain_verfication_code);
- cb_user_agreement = (CheckBox) findViewById(R.id.cb_user_agreement);
- tv_confirm = (TextView) findViewById(R.id.tv_confirm);
- ll_login_content = (LinearLayout) findViewById(R.id.ll_login_content);
-
- int w = View.MeasureSpec.makeMeasureSpec(0,
- View.MeasureSpec.UNSPECIFIED);
- int h = View.MeasureSpec.makeMeasureSpec(0,
- View.MeasureSpec.UNSPECIFIED);
- ll_login_content.measure(w, h);
- int width = ll_login_content.getMeasuredWidth();
- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width,
- (int) (width * 0.434));
- params.gravity = Gravity.CENTER_HORIZONTAL;
- iv_register_top.setLayoutParams(params);
-
- et_email.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- // et_email.getText().toString()
- if (!StringUtils.isEmpty(et_verfication_code.getText()
- .toString())
- && !StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
-
- if (!StringUtils.isEmpty(arg0.toString())) {
- tv_obtain_verfication_code.setBackground(getResources()
- .getDrawable(R.drawable.shape_login2));
- } else {
- tv_obtain_verfication_code.setBackground(getResources()
- .getDrawable(R.drawable.shape_login1));
- }
-
- }
- });
- et_verfication_code.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_email.getText().toString())
- && !StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
-
- }
- });
-
- et_pwd.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
-
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
-
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_verfication_code.getText()
- .toString())
- && !StringUtils.isEmpty(et_email.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
- }
- });
-
- tv_obtain_verfication_code.setOnClickListener(this);
- tv_confirm.setOnClickListener(this);
- findViewById(R.id.tv_back).setOnClickListener(this);
- findViewById(R.id.tv_user_agreement).setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.tv_back:
- finish();
- break;
- case R.id.tv_user_agreement:
- Intent intent = new Intent(RegisterActivity.this,
- BrowserActivity.class);
- intent.putExtra("url", getString(R.string.agreement));
- startActivity(intent);
- break;
- case R.id.tv_obtain_verfication_code:
- String email = et_email.getText().toString();
- if (StringUtils.isEmpty(email)) {
- SingleToast.showToast(RegisterActivity.this, "璇峰厛杈撳叆閭璐﹀彿");
- } else {
- Matcher m = IsEmail.isEmailAddress().matcher(email);
- if (m.matches()) {
- getVerficationCode(email);
- } else {
- SingleToast.showToast(RegisterActivity.this,
- "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
- return;
- }
- }
- break;
-
- case R.id.tv_confirm:
- String email1 = et_email.getText().toString();
- String pwd = et_pwd.getText().toString();
- String verficationCode = et_verfication_code.getText().toString();
- if (StringUtils.isEmpty(email1)) {
- SingleToast.showToast(RegisterActivity.this, "璇峰厛杈撳叆閭璐﹀彿");
- return;
- } else {
- Matcher m = IsEmail.isEmailAddress().matcher(email1);
- if (!m.matches()) {
- SingleToast.showToast(RegisterActivity.this,
- "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
- return;
- }
- }
- if (StringUtils.isEmpty(pwd)) {
- SingleToast.showToast(RegisterActivity.this, "瀵嗙爜涓嶈兘涓虹┖");
- return;
- }
- if (pwd.length() < 6) {
- SingleToast.showToast(RegisterActivity.this, "瀵嗙爜闀垮害涓嶈兘浣庝簬6浣�");
- return;
- }
- if (StringUtils.isEmpty(verficationCode)) {
- SingleToast.showToast(RegisterActivity.this, "楠岃瘉鐮佷笉鑳戒负绌�");
- return;
- }
- userRegister();
- break;
- }
- }
-
- private void userRegister() {
- SharedPreferences sp = getSharedPreferences("user",
- Context.MODE_PRIVATE);
- final String uid = sp.getString("uid", "");
- MGVideoAPI.emailRegister(this, uid, et_email.getText().toString(),
- et_pwd.getText().toString(), et_verfication_code.getText()
- .toString(), "鏃犲悕姘�", new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SingleToast.showToast(RegisterActivity.this,
- "娉ㄥ唽鎴愬姛锛�");
- emailLogin(et_email.getText().toString(), et_pwd
- .getText().toString(), uid);
- } else {
- SingleToast.showToast(RegisterActivity.this,
- jsonObject.optString("Error") + ",娉ㄥ唽澶辫触!");
- }
- }
-
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers, responseString,
- throwable);
- SingleToast.showToast(RegisterActivity.this,
- "娉ㄥ唽澶辫触锛岃閲嶆柊娉ㄥ唽");
- }
- });
- }
-
- /**
- * 娉ㄥ唽鎴愬姛鍚庣櫥闄嗭紝鑾峰彇鐧诲綍淇℃伅
- */
- /**
- * Email鐧婚檰
- */
- private void emailLogin(String email, String pwd, String uid) {
- MGVideoAPI.emailLogin(RegisterActivity.this, uid, email, pwd,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SharedPreferences sp = getSharedPreferences("user",
- MODE_PRIVATE);
- SharedPreferences.Editor edit = sp.edit();
- edit.putString("portrait", jsonObject
- .optJSONObject("Data")
- .optString("Portrait"));
- edit.putString("LoginUid", jsonObject
- .getJSONObject("Data").getString("Id"));
- edit.putString(
- "name",
- jsonObject.optJSONObject("Data").optString(
- "NickName"));
- edit.commit();
- SingleToast
- .showToast(RegisterActivity.this, "鐧婚檰鎴愬姛");
- Intent intent = new Intent(RegisterActivity.this,
- PersonInfoActivity.class);
- startActivity(intent);
- finish();
- } else {
- SingleToast
- .showToast(RegisterActivity.this, "鐧婚檰澶辫触");
- }
- }
-
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers, responseString,
- throwable);
- SingleToast.showToast(RegisterActivity.this, "鐧婚檰澶辫触");
- }
- });
-
- }
-
- Timer timer;
- int timecount = 59;
-
- private void getVerficationCode(String email) {
- timer = new Timer();
- timer.schedule(new MyTask(), 1000, 1000);
- SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
- String uid = sp.getString("uid", "");
- MGVideoAPI.getVerficationCode(RegisterActivity.this, uid, email,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SingleToast.showToast(RegisterActivity.this,
- "鑾峰彇楠岃瘉鐮佹垚鍔燂紝璇锋墦寮�閭鏌ョ湅锛�");
- } else {
- SingleToast.showToast(RegisterActivity.this,
- "鑾峰彇楠岃瘉鐮佸け璐�,璇烽噸鏂拌幏鍙栵紒");
- handler.sendEmptyMessage(1);
- }
- }
- });
- }
-
- class MyTask extends TimerTask {
- @Override
- public void run() {
- if (timecount > 0) {
- handler.sendEmptyMessage(0);
- } else {
- handler.sendEmptyMessage(1);
- }
- }
- }
-
- Handler handler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- switch (msg.what) {
- case 0:
- tv_obtain_verfication_code.setClickable(false);
- tv_obtain_verfication_code.setText("閲嶆柊鍙戦��(" + timecount + "s)");
- timecount--;
- break;
- case 1:
- timer.cancel();
- tv_obtain_verfication_code.setText("鑾峰彇楠岃瘉鐮�");
- tv_obtain_verfication_code.setClickable(true);
- timecount = 59;
- break;
- }
- }
- };
-}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/main/MineFragment.java b/MGVideo/src/com/mugua/mgvideo/ui/main/MineFragment.java
index 79be15f..70d4780 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/main/MineFragment.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/main/MineFragment.java
@@ -40,17 +40,18 @@
import com.lcjian.library.util.common.StringUtils;
import com.mugua.mgvideo.R;
import com.mugua.mgvideo.ui.mine.SuggestionActivity;
+import com.mugua.mgvideo.util.ConfigUtil;
import com.umeng.analytics.MobclickAgent;
import com.umeng.socialize.ShareAction;
import com.umeng.socialize.UMShareListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.media.UMWeb;
+import com.yeshi.base.ui.LoginActivity;
import com.yeshi.base.ui.PersonInfoActivity;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.mugua.mgvideo.MGVideoAPI;
import com.mugua.mgvideo.db.MessageTable;
import com.mugua.mgvideo.entity.Banner;
-import com.mugua.mgvideo.ui.login.LoginActivity;
import com.mugua.mgvideo.ui.mine.BrowserActivity;
import com.mugua.mgvideo.ui.mine.MyFavouriteActivity;
import com.mugua.mgvideo.ui.mine.SettingsActivity;
@@ -290,7 +291,7 @@
}
}
break;
- case R.id.rl_suggestion: {// 甯姪涓庡弽棣�
+ case R.id.rl_suggestion: {// 鍏充簬鎴戜滑
// Intent intent = new Intent(getActivity(),
// HelpAndTicklingActivity.class);
// startActivity(intent);
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/main/RecommendNewFragment.java b/MGVideo/src/com/mugua/mgvideo/ui/main/RecommendNewFragment.java
index f3c35d8..28e15c1 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/main/RecommendNewFragment.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/main/RecommendNewFragment.java
@@ -39,7 +39,6 @@
import com.mugua.mgvideo.entity.HomeType;
import com.mugua.mgvideo.entity.HomeTypeItem;
import com.mugua.mgvideo.entity.HomeVideo;
-import com.mugua.mgvideo.entity.JumpDetail;
import com.mugua.mgvideo.entity.recommend.HomeClass;
import com.mugua.mgvideo.test.MyViewPager;
import com.mugua.mgvideo.ui.category.bean.HotStar;
@@ -47,12 +46,14 @@
import com.mugua.mgvideo.ui.recommend.RecommendTopAdapter;
import com.mugua.mgvideo.ui.recommend.SearchActivity;
import com.mugua.mgvideo.util.DimenUtils;
-import com.mugua.mgvideo.util.JumpActivityUtil;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.umeng.analytics.MobclickAgent;
import com.viewpagerindicator.LinePageIndicator;
+import com.yeshi.base.entity.JumpDetail;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.ad.ExpressAdContainer;
import com.yeshi.base.entity.video.VideoInfo;
+import com.yeshi.base.utils.JumpActivityUtil;
import com.yeshi.base.utils.RouteConstant;
import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.CSJConstant;
@@ -431,6 +432,9 @@
private List<ExpressAdContainer> adList;
private void loadAd() {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) == null)
+ return;
+
try {
ExpressAdManager recommendAdManager = new ExpressAdManager(AdUtil.AD_TYPE.csj, context);
//鍔犺浇澶у浘
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/mine/SettingsActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/mine/SettingsActivity.java
index 22be7b7..43ed08b 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/mine/SettingsActivity.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/mine/SettingsActivity.java
@@ -30,6 +30,7 @@
import com.bumptech.glide.Glide;
import com.lcjian.library.util.common.StringUtils;
import com.mugua.mgvideo.R;
+import com.mugua.mgvideo.util.ConfigUtil;
import com.umeng.analytics.MobclickAgent;
import com.mugua.mgvideo.entity.SDCardEntity;
import com.mugua.mgvideo.ui.BaseActivity;
@@ -40,291 +41,292 @@
import com.ysh.wpc.appupdate.AppUpdate;
public class SettingsActivity extends BaseActivity implements OnClickListener,
- OnCheckedChangeListener {
+ OnCheckedChangeListener {
- private TextView tv_top_bar_left;
- private TextView tv_top_bar_middle;
- private TextView tv_version_name;// 鐗堟湰鍙�
+ private TextView tv_top_bar_left;
+ private TextView tv_top_bar_middle;
+ private TextView tv_version_name;// 鐗堟湰鍙�
- private CheckBox chb_only_wifi_download;
- private RelativeLayout rl_clear_cache;
- private RelativeLayout rl_about_us;
- private RelativeLayout rl_check_update;// 妫�鏌ユ洿鏂�
- private RelativeLayout rl_disclaimer;
+ private CheckBox chb_only_wifi_download;
+ private RelativeLayout rl_clear_cache;
+ private RelativeLayout rl_about_us;
+ private RelativeLayout rl_check_update;// 妫�鏌ユ洿鏂�
+ private RelativeLayout rl_disclaimer;
- private Button btn_exit;// 绂诲紑鎸夐挳
- private View view_sdcard;
- private TextView tv_mobile;
- private TextView tv_sdcard;
- private CheckBox cb_mobile;
- private CheckBox cb_sdcard;
+ private Button btn_exit;// 绂诲紑鎸夐挳
+ private View view_sdcard;
+ private TextView tv_mobile;
+ private TextView tv_sdcard;
+ private CheckBox cb_mobile;
+ private CheckBox cb_sdcard;
- private void chageSize(TextView tv, int start, int end) {
- SpannableStringBuilder spanBuilder = new SpannableStringBuilder(tv
- .getText().toString());
+ private void chageSize(TextView tv, int start, int end) {
+ SpannableStringBuilder spanBuilder = new SpannableStringBuilder(tv
+ .getText().toString());
- spanBuilder.setSpan(new TextAppearanceSpan(null, 0, getResources()
- .getDimensionPixelSize(R.dimen.alphabet_size), null, null),
- start, end, Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
- tv.setText(spanBuilder);
- }
+ spanBuilder.setSpan(new TextAppearanceSpan(null, 0, getResources()
+ .getDimensionPixelSize(R.dimen.alphabet_size), null, null),
+ start, end, Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+ tv.setText(spanBuilder);
+ }
- /** 鍒濆鍖栧唴瀛樻樉绀� */
- private void initStorageView() {
+ /**
+ * 鍒濆鍖栧唴瀛樻樉绀�
+ */
+ private void initStorageView() {
- tv_mobile.setText("鎵嬫満瀛樺偍: 鎬婚噺:"
- + SDCardUtil.getSotrageSize(SDCardUtil
- .getTotalExternalMemorySize() / (1024 * 1024))
- + " 鍙敤:"
- + SDCardUtil.getSotrageSize(SDCardUtil
- .getAvailableExternalMemorySize() / (1024 * 1024)));
- chageSize(tv_mobile, 5, tv_mobile.getText().length());
- SDCardEntity entity = SDCardUtil.getSDCardPath(this);
- if (entity == null) {// 娌℃湁澶栭儴瀛樺偍鍗�
- view_sdcard.setVisibility(View.GONE);
- cb_mobile.setVisibility(View.GONE);
- } else {
- tv_sdcard.setText("SD鍗″瓨鍌�: 鎬婚噺:"
- + SDCardUtil.getSotrageSize(entity.getTotalSize()
- / (1024 * 1024))
- + " 鍙敤:"
- + SDCardUtil.getSotrageSize(entity.getAvailableSize()
- / (1024 * 1024)));
- chageSize(tv_sdcard, 6, tv_sdcard.getText().length());
- view_sdcard.setVisibility(View.VISIBLE);
- cb_mobile.setVisibility(View.VISIBLE);
- if (SDCardUtil.getDeaultStorage(this) == SDCardUtil.STORAGE_SDCARD) {
- cb_sdcard.setChecked(true);
- cb_mobile.setChecked(false);
- } else {
- cb_sdcard.setChecked(false);
- cb_mobile.setChecked(true);
- }
- }
- }
+ tv_mobile.setText("鎵嬫満瀛樺偍: 鎬婚噺:"
+ + SDCardUtil.getSotrageSize(SDCardUtil
+ .getTotalExternalMemorySize() / (1024 * 1024))
+ + " 鍙敤:"
+ + SDCardUtil.getSotrageSize(SDCardUtil
+ .getAvailableExternalMemorySize() / (1024 * 1024)));
+ chageSize(tv_mobile, 5, tv_mobile.getText().length());
+ SDCardEntity entity = SDCardUtil.getSDCardPath(this);
+ if (entity == null) {// 娌℃湁澶栭儴瀛樺偍鍗�
+ view_sdcard.setVisibility(View.GONE);
+ cb_mobile.setVisibility(View.GONE);
+ } else {
+ tv_sdcard.setText("SD鍗″瓨鍌�: 鎬婚噺:"
+ + SDCardUtil.getSotrageSize(entity.getTotalSize()
+ / (1024 * 1024))
+ + " 鍙敤:"
+ + SDCardUtil.getSotrageSize(entity.getAvailableSize()
+ / (1024 * 1024)));
+ chageSize(tv_sdcard, 6, tv_sdcard.getText().length());
+ view_sdcard.setVisibility(View.VISIBLE);
+ cb_mobile.setVisibility(View.VISIBLE);
+ if (SDCardUtil.getDeaultStorage(this) == SDCardUtil.STORAGE_SDCARD) {
+ cb_sdcard.setChecked(true);
+ cb_mobile.setChecked(false);
+ } else {
+ cb_sdcard.setChecked(false);
+ cb_mobile.setChecked(true);
+ }
+ }
+ }
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.settings_activity);
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.settings_activity);
- view_sdcard = findViewById(R.id.rl_storage_sdcard);
- tv_mobile = (TextView) findViewById(R.id.tv_storage_mobile);
- tv_sdcard = (TextView) findViewById(R.id.tv_storage_sdcard);
- cb_mobile = (CheckBox) findViewById(R.id.cb_storage_mobile);
- cb_sdcard = (CheckBox) findViewById(R.id.cb_storage_sdcard);
- cb_mobile.setOnCheckedChangeListener(this);
- cb_sdcard.setOnCheckedChangeListener(this);
+ view_sdcard = findViewById(R.id.rl_storage_sdcard);
+ tv_mobile = (TextView) findViewById(R.id.tv_storage_mobile);
+ tv_sdcard = (TextView) findViewById(R.id.tv_storage_sdcard);
+ cb_mobile = (CheckBox) findViewById(R.id.cb_storage_mobile);
+ cb_sdcard = (CheckBox) findViewById(R.id.cb_storage_sdcard);
+ cb_mobile.setOnCheckedChangeListener(this);
+ cb_sdcard.setOnCheckedChangeListener(this);
- tv_top_bar_left = (TextView) findViewById(R.id.tv_top_bar_left);
- tv_top_bar_middle = (TextView) findViewById(R.id.tv_top_bar_middle);
- tv_top_bar_left.setText("杩斿洖");
- tv_top_bar_middle.setText("璁剧疆");
+ tv_top_bar_left = (TextView) findViewById(R.id.tv_top_bar_left);
+ tv_top_bar_middle = (TextView) findViewById(R.id.tv_top_bar_middle);
+ tv_top_bar_left.setText("杩斿洖");
+ tv_top_bar_middle.setText("璁剧疆");
- tv_top_bar_left.setOnClickListener(this);
+ tv_top_bar_left.setOnClickListener(this);
- chb_only_wifi_download = (CheckBox) findViewById(R.id.chb_only_wifi_download);
- rl_clear_cache = (RelativeLayout) findViewById(R.id.rl_clear_cache);
- rl_disclaimer = (RelativeLayout) findViewById(R.id.rl_disclaimer);
- rl_about_us = (RelativeLayout) findViewById(R.id.rl_about_us);
- rl_check_update = (RelativeLayout) findViewById(R.id.rl_check_update);
- tv_version_name = (TextView) findViewById(R.id.tv_version_name);
- btn_exit = (Button) findViewById(R.id.setting_btn_exit);
+ chb_only_wifi_download = (CheckBox) findViewById(R.id.chb_only_wifi_download);
+ rl_clear_cache = (RelativeLayout) findViewById(R.id.rl_clear_cache);
+ rl_disclaimer = (RelativeLayout) findViewById(R.id.rl_disclaimer);
+ rl_about_us = (RelativeLayout) findViewById(R.id.rl_about_us);
+ rl_check_update = (RelativeLayout) findViewById(R.id.rl_check_update);
+ tv_version_name = (TextView) findViewById(R.id.tv_version_name);
+ btn_exit = (Button) findViewById(R.id.setting_btn_exit);
- btn_exit.setOnClickListener(this);
- rl_clear_cache.setOnClickListener(this);
- rl_disclaimer.setOnClickListener(this);
- rl_about_us.setOnClickListener(this);
- rl_check_update.setOnClickListener(this);
+ btn_exit.setOnClickListener(this);
+ rl_clear_cache.setOnClickListener(this);
+ rl_disclaimer.setOnClickListener(this);
+ rl_about_us.setOnClickListener(this);
+ rl_check_update.setOnClickListener(this);
- final SharedPreferences settings = getSharedPreferences("settings",
- Context.MODE_PRIVATE);
- chb_only_wifi_download.setChecked(settings.getBoolean(
- "only_wifi_download", true));
- chb_only_wifi_download
- .setOnCheckedChangeListener(new OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView,
- boolean isChecked) {
- settings.edit()
- .putBoolean("only_wifi_download", isChecked)
- .commit();
- }
- });
- initStorageView();
- tv_version_name.setText("鐗堟湰鍙�:" + getVersionName(this));
- // 绂诲紑鎸夐挳鏄惁鏄剧ず
- if (StringUtils.isEmpty(getSharedPreferences("user",
- Context.MODE_PRIVATE).getString("LoginUid", ""))) {// 濡傛灉涓虹┖瀛楃
- btn_exit.setVisibility(View.GONE);
- }
- }
+ final SharedPreferences settings = getSharedPreferences("settings",
+ Context.MODE_PRIVATE);
+ chb_only_wifi_download.setChecked(settings.getBoolean(
+ "only_wifi_download", true));
+ chb_only_wifi_download
+ .setOnCheckedChangeListener(new OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView,
+ boolean isChecked) {
+ settings.edit()
+ .putBoolean("only_wifi_download", isChecked)
+ .commit();
+ }
+ });
+ initStorageView();
+ tv_version_name.setText("鐗堟湰鍙�:" + getVersionName(this));
+ // 绂诲紑鎸夐挳鏄惁鏄剧ず
+ if (StringUtils.isEmpty(getSharedPreferences("user",
+ Context.MODE_PRIVATE).getString("LoginUid", ""))) {// 濡傛灉涓虹┖瀛楃
+ btn_exit.setVisibility(View.GONE);
+ }
+ }
- /*** 鑾峰彇鐗堟湰鍙� */
- public static String getVersionName(Context context) {
- try {
- PackageInfo pi = context.getPackageManager().getPackageInfo(
- context.getPackageName(), 0);
- return pi.versionName;
- } catch (NameNotFoundException e) {
- e.printStackTrace();
- return "";
- }
- }
+ /*** 鑾峰彇鐗堟湰鍙� */
+ public static String getVersionName(Context context) {
+ try {
+ PackageInfo pi = context.getPackageManager().getPackageInfo(
+ context.getPackageName(), 0);
+ return pi.versionName;
+ } catch (NameNotFoundException e) {
+ e.printStackTrace();
+ return "";
+ }
+ }
- @Override
- public void onResume() {
- super.onResume();
- BadgeView mBadge = new BadgeView(this, tv_version_name);
- mBadge.setBackgroundResource(R.drawable.ic_red_dot);
- mBadge.setTextSize(1);
- mBadge.setText("");
- SharedPreferences preferences = this.getSharedPreferences("update",
- Context.MODE_PRIVATE);
- boolean mStatus = preferences.getBoolean("status", false);
- if (mStatus) {
- mBadge.show();
- } else {
- mBadge.hide();
- }
- MobclickAgent.onPageStart("璁剧疆椤�");
- }
+ @Override
+ public void onResume() {
+ super.onResume();
+ BadgeView mBadge = new BadgeView(this, tv_version_name);
+ mBadge.setBackgroundResource(R.drawable.ic_red_dot);
+ mBadge.setTextSize(1);
+ mBadge.setText("");
+ SharedPreferences preferences = this.getSharedPreferences("update",
+ Context.MODE_PRIVATE);
+ boolean mStatus = preferences.getBoolean("status", false);
+ if (mStatus) {
+ mBadge.show();
+ } else {
+ mBadge.hide();
+ }
+ MobclickAgent.onPageStart("璁剧疆椤�");
+ }
- @Override
- public void onPause() {
- super.onPause();
- MobclickAgent.onPageEnd("璁剧疆椤�");
- }
+ @Override
+ public void onPause() {
+ super.onPause();
+ MobclickAgent.onPageEnd("璁剧疆椤�");
+ }
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.setting_btn_exit:// 鐐瑰嚮绂诲紑
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage("纭畾瑕侀��鍑虹櫥褰曞悧锛�")
- .setNegativeButton("鍙栨秷", null)
- .setPositiveButton("纭畾",
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog,
- int which) {
- Editor edit = getSharedPreferences("user",
- Context.MODE_PRIVATE).edit();
- edit.putString("LoginUid", "");
- edit.commit();
- MineFragment.isLogin = false;// 鏀逛负鏈櫥褰曠姸鎬�
- finish();
- }
- });
- builder.create().show();
- break;
- case R.id.rl_check_update:// 鐐瑰嚮妫�鏌ユ洿鏂�
- AppUpdate.setAppUpdateActivity(this);
- Map<String, String> map = new HashMap<>();
- map.put("360", "6c8349cc7260ae62e3b1396831a8398f");
- map.put("QQ", "d9d4f495e875a2e075a1a4a6e1b9770f");
- map.put("GuanWang", "a5771bce93e200c36f7cd9dfd0e5deaa");
- if ("360".equalsIgnoreCase(getChannelName())) {
- AppUpdate.setAppUpdateKey(map.get("360"));
- } else if ("QQ".equalsIgnoreCase(getChannelName())) {
- AppUpdate.setAppUpdateKey(map.get("QQ"));
- } else {
- AppUpdate.setAppUpdateKey(map.get("GuanWang"));
- }
- AppUpdate.initAppUpdate();
- break;
- case R.id.tv_top_bar_left: {
- finish();
- }
- break;
- case R.id.rl_clear_cache: {
- AlertDialog.Builder builder2 = new AlertDialog.Builder(this);
- builder2.setMessage("纭畾娓呯┖鍥剧墖缂撳瓨锛�")
- .setNegativeButton("鍙栨秷", null)
- .setPositiveButton("纭畾",
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog,
- int which) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- Glide.get(SettingsActivity.this)
- .clearDiskCache();
- }
- }).start();
- // ImageLoader.getInstance().clearDiskCache();
- Toast.makeText(SettingsActivity.this,
- "缂撳瓨宸叉竻绌�", Toast.LENGTH_SHORT).show();
- }
- });
- builder2.create().show();
- }
- break;
- case R.id.rl_disclaimer: {
- Intent intent = new Intent(this, BrowserActivity.class);
- intent.putExtra("url", BeibeiConstant.HOST + "/new_video/"
- + "api_disclaimer.jsp?package=" + getPackageName());
- startActivity(intent);
- }
- break;
- case R.id.rl_about_us: {
- Intent intent = new Intent(this, BrowserActivity.class);
- intent.putExtra("url", BeibeiConstant.HOST + "/new_video/"
- + "api_about_us.jsp?package=" + getPackageName());
- startActivity(intent);
- }
- break;
- default:
- break;
- }
- }
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.setting_btn_exit:// 鐐瑰嚮绂诲紑
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setMessage("纭畾瑕侀��鍑虹櫥褰曞悧锛�")
+ .setNegativeButton("鍙栨秷", null)
+ .setPositiveButton("纭畾",
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog,
+ int which) {
+ Editor edit = getSharedPreferences("user",
+ Context.MODE_PRIVATE).edit();
+ edit.putString("LoginUid", "");
+ edit.commit();
+ MineFragment.isLogin = false;// 鏀逛负鏈櫥褰曠姸鎬�
+ finish();
+ }
+ });
+ builder.create().show();
+ break;
+ case R.id.rl_check_update:// 鐐瑰嚮妫�鏌ユ洿鏂�
+ AppUpdate.setAppUpdateActivity(this);
+ Map<String, String> map = new HashMap<>();
+ map.put("360", "6c8349cc7260ae62e3b1396831a8398f");
+ map.put("QQ", "d9d4f495e875a2e075a1a4a6e1b9770f");
+ map.put("GuanWang", "a5771bce93e200c36f7cd9dfd0e5deaa");
+ if ("360".equalsIgnoreCase(getChannelName())) {
+ AppUpdate.setAppUpdateKey(map.get("360"));
+ } else if ("QQ".equalsIgnoreCase(getChannelName())) {
+ AppUpdate.setAppUpdateKey(map.get("QQ"));
+ } else {
+ AppUpdate.setAppUpdateKey(map.get("GuanWang"));
+ }
+ AppUpdate.initAppUpdate();
+ break;
+ case R.id.tv_top_bar_left: {
+ finish();
+ }
+ break;
+ case R.id.rl_clear_cache: {
+ AlertDialog.Builder builder2 = new AlertDialog.Builder(this);
+ builder2.setMessage("纭畾娓呯┖鍥剧墖缂撳瓨锛�")
+ .setNegativeButton("鍙栨秷", null)
+ .setPositiveButton("纭畾",
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog,
+ int which) {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ Glide.get(SettingsActivity.this)
+ .clearDiskCache();
+ }
+ }).start();
+ // ImageLoader.getInstance().clearDiskCache();
+ Toast.makeText(SettingsActivity.this,
+ "缂撳瓨宸叉竻绌�", Toast.LENGTH_SHORT).show();
+ }
+ });
+ builder2.create().show();
+ }
+ break;
+ case R.id.rl_disclaimer: {
+ Intent intent = new Intent(this, BrowserActivity.class);
+ intent.putExtra("url", BeibeiConstant.HOST + "/new_video/"
+ + "api_disclaimer.jsp?package=" + getPackageName());
+ startActivity(intent);
+ }
+ break;
+ case R.id.rl_about_us: {
+ Intent intent = new Intent(this, BrowserActivity.class);
+ intent.putExtra("url", getString(R.string.about_us_url));
+ startActivity(intent);
+ }
+ break;
+ default:
+ break;
+ }
+ }
- private String getChannelName() {
- String channelName = null;
- try {
- PackageManager packageManager = getPackageManager();
- if (packageManager != null) {
- // 娉ㄦ剰姝ゅ涓篈pplicationInfo 鑰屼笉鏄�
- // ActivityInfo,鍥犱负鍙嬬洘璁剧疆鐨刴eta-data鏄湪application鏍囩涓紝鑰屼笉鏄煇activity鏍囩涓紝鎵�浠ョ敤ApplicationInfo
- ApplicationInfo applicationInfo = packageManager
- .getApplicationInfo(
- SettingsActivity.this.getPackageName(),
- PackageManager.GET_META_DATA);
- if (applicationInfo != null) {
- if (applicationInfo.metaData != null) {
- channelName = applicationInfo.metaData
- .getString("UMENG_CHANNEL");
- }
- }
+ private String getChannelName() {
+ String channelName = null;
+ try {
+ PackageManager packageManager = getPackageManager();
+ if (packageManager != null) {
+ // 娉ㄦ剰姝ゅ涓篈pplicationInfo 鑰屼笉鏄�
+ // ActivityInfo,鍥犱负鍙嬬洘璁剧疆鐨刴eta-data鏄湪application鏍囩涓紝鑰屼笉鏄煇activity鏍囩涓紝鎵�浠ョ敤ApplicationInfo
+ ApplicationInfo applicationInfo = packageManager
+ .getApplicationInfo(
+ SettingsActivity.this.getPackageName(),
+ PackageManager.GET_META_DATA);
+ if (applicationInfo != null) {
+ if (applicationInfo.metaData != null) {
+ channelName = applicationInfo.metaData
+ .getString("UMENG_CHANNEL");
+ }
+ }
- }
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
- return channelName;
- }
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ e.printStackTrace();
+ }
+ return channelName;
+ }
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (buttonView.getId() == R.id.cb_storage_mobile) {
- if (isChecked) {
- SDCardUtil.setDeaultStorage(this, SDCardUtil.STORAGE_MOBILE);
- cb_sdcard.setChecked(false);
- }
- } else {
- if (isChecked) {
- SDCardUtil.setDeaultStorage(this, SDCardUtil.STORAGE_SDCARD);
- cb_mobile.setChecked(false);
- }
- }
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (buttonView.getId() == R.id.cb_storage_mobile) {
+ if (isChecked) {
+ SDCardUtil.setDeaultStorage(this, SDCardUtil.STORAGE_MOBILE);
+ cb_sdcard.setChecked(false);
+ }
+ } else {
+ if (isChecked) {
+ SDCardUtil.setDeaultStorage(this, SDCardUtil.STORAGE_SDCARD);
+ cb_mobile.setChecked(false);
+ }
+ }
- }
+ }
- @Override
- protected void onDestroy() {
- // TODO Auto-generated method stub
- super.onDestroy();
- AppUpdate.destoryAppUpdate();
- }
+ @Override
+ protected void onDestroy() {
+ // TODO Auto-generated method stub
+ super.onDestroy();
+ AppUpdate.destoryAppUpdate();
+ }
}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendNewAdapter.java b/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendNewAdapter.java
index 8a2cb60..b27211c 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendNewAdapter.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendNewAdapter.java
@@ -32,9 +32,9 @@
import com.mugua.mgvideo.ui.category.StarsActivity;
import com.mugua.mgvideo.ui.common.VideosLiveActivity;
import com.mugua.mgvideo.ui.video.VideoRecommendAdapter;
-import com.mugua.mgvideo.util.JumpActivityUtil;
import com.yeshi.base.entity.ad.ExpressAdContainer;
import com.yeshi.base.entity.video.VideoType;
+import com.yeshi.base.utils.JumpActivityUtil;
import com.yeshi.base.utils.ad.ExpressAdManager;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.ysh.wpc.appupdate.util.StringUtils;
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendTopAdapter.java b/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendTopAdapter.java
index a0b6e52..61fdf57 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendTopAdapter.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/recommend/RecommendTopAdapter.java
@@ -1,13 +1,7 @@
package com.mugua.mgvideo.ui.recommend;
-import java.util.Iterator;
-import java.util.List;
-
-import org.json.JSONObject;
-
import android.content.Context;
import android.content.Intent;
-import androidx.viewpager.widget.PagerAdapter;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@@ -17,103 +11,112 @@
import com.bumptech.glide.Glide;
import com.mugua.mgvideo.MGVideoApplication;
+import com.mugua.mgvideo.entity.HomeAd;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
-import com.mugua.mgvideo.entity.HomeAd;
+import com.yeshi.base.utils.JumpActivityUtil;
import com.yeshi.video.ui.VideoDetailActivity;
+
+import org.json.JSONObject;
+
+import java.util.Iterator;
+import java.util.List;
+
+import androidx.viewpager.widget.PagerAdapter;
import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
public class RecommendTopAdapter extends PagerAdapter {
- private ImageLoader imageLoader = ImageLoader.getInstance();
+ private ImageLoader imageLoader = ImageLoader.getInstance();
- private DisplayImageOptions options;
+ private DisplayImageOptions options;
- private List<HomeAd> mHomeAds;
+ private List<HomeAd> mHomeAds;
- private Context context;
+ private Context context;
- public RecommendTopAdapter(List<HomeAd> homeAds, Context context) {
- super();
- this.context = context;
- this.mHomeAds = homeAds;
- this.options = new DisplayImageOptions.Builder()
- .resetViewBeforeLoading(true).cacheInMemory(true)
- .cacheOnDisk(true).imageScaleType(ImageScaleType.EXACTLY)
- .considerExifParams(true)
- .displayer(new FadeInBitmapDisplayer(300)).build();
- }
+ public RecommendTopAdapter(List<HomeAd> homeAds, Context context) {
+ super();
+ this.context = context;
+ this.mHomeAds = homeAds;
+ this.options = new DisplayImageOptions.Builder()
+ .resetViewBeforeLoading(true).cacheInMemory(true)
+ .cacheOnDisk(true).imageScaleType(ImageScaleType.EXACTLY)
+ .considerExifParams(true)
+ .displayer(new FadeInBitmapDisplayer(300)).build();
+ }
- @Override
- public int getCount() {
- return mHomeAds == null ? 0 : mHomeAds.size();
- }
+ @Override
+ public int getCount() {
+ return mHomeAds == null ? 0 : mHomeAds.size();
+ }
- @Override
- public Object instantiateItem(ViewGroup container, final int position) {
- ImageView view = new ImageView(container.getContext());
- view.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
- LayoutParams.MATCH_PARENT));
- view.setScaleType(ScaleType.FIT_XY);
- view.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = null;
- if (mHomeAds.get(position).getLinkType() == 1) {
- intent = new Intent(v.getContext(),
- VideoDetailActivity.class);
- intent.putExtra("video_info", mHomeAds.get(position)
- .getVideo());
- } else {
- try {
- intent = new Intent(v.getContext(), Class
- .forName(mHomeAds.get(position).getClazz()));
- if (mHomeAds.get(position).getParams() != null) {
- JSONObject object = new JSONObject(mHomeAds
- .get(position).getParams()
- .replace("\\", ""));
- @SuppressWarnings("unchecked")
- Iterator<String> its = object.keys();
- while (its.hasNext()) {
- String key = its.next();
- String value = object.optString(key);
- intent.putExtra(key, value);
- intent.putExtra("isPush", true);
- }
- }
+ @Override
+ public Object instantiateItem(ViewGroup container, final int position) {
+ ImageView view = new ImageView(container.getContext());
+ view.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
+ LayoutParams.MATCH_PARENT));
+ view.setScaleType(ScaleType.FIT_XY);
+ view.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = null;
+ if (mHomeAds.get(position).getLinkType() == 1) {
+ intent = new Intent(v.getContext(),
+ VideoDetailActivity.class);
+ intent.putExtra("video_info", mHomeAds.get(position)
+ .getVideo());
+ } else {
+ try {
+ intent = new Intent(v.getContext(), Class
+ .forName(JumpActivityUtil.filterActivityName(mHomeAds.get(position).getClazz())));
+ if (mHomeAds.get(position).getParams() != null) {
+ JSONObject object = new JSONObject(mHomeAds
+ .get(position).getParams()
+ .replace("\\", ""));
+ @SuppressWarnings("unchecked")
+ Iterator<String> its = object.keys();
+ while (its.hasNext()) {
+ String key = its.next();
+ String value = object.optString(key);
+ intent.putExtra(key, value);
+ intent.putExtra("isPush", true);
+ }
+ }
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- MGVideoApplication.application.startActivity(intent);
- }
- });
- Glide.with(context).load(mHomeAds.get(position).getPicture())
- .transition(withCrossFade()).into(view);
- // imageLoader.displayImage(mHomeAds.get(position).getPicture(), view,
- // options);
- container.addView(view);
- return view;
- }
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ MGVideoApplication.application.startActivity(intent);
+ }
+ });
+ Glide.with(context).load(mHomeAds.get(position).getPicture())
+ .transition(withCrossFade()).into(view);
+ // imageLoader.displayImage(mHomeAds.get(position).getPicture(), view,
+ // options);
+ container.addView(view);
+ return view;
+ }
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- container.removeView((View) object);
- }
+ @Override
+ public void destroyItem(ViewGroup container, int position, Object object) {
+ container.removeView((View) object);
+ }
- @Override
- public boolean isViewFromObject(View view, Object object) {
- return view == object;
- }
+ @Override
+ public boolean isViewFromObject(View view, Object object) {
+ return view == object;
+ }
- @Override
- public CharSequence getPageTitle(int position) {
- return mHomeAds.get(position).getTitle();
- }
+ @Override
+ public CharSequence getPageTitle(int position) {
+ return mHomeAds.get(position).getTitle();
+ }
}
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/recommend/SearchActivity.java b/MGVideo/src/com/mugua/mgvideo/ui/recommend/SearchActivity.java
index 709596f..7656705 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/recommend/SearchActivity.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/recommend/SearchActivity.java
@@ -35,6 +35,8 @@
import com.qq.e.ads.nativ.NativeExpressADView;
import com.qq.e.comm.util.AdError;
import com.umeng.analytics.MobclickAgent;
+import com.yeshi.base.entity.ad.AdPositionEnum;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.GDTConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.mugua.mgvideo.MGVideoAPI;
@@ -211,7 +213,7 @@
getHotSearch();
getHistorySearch();
guessLike();// 鑱氭晥骞垮憡鍙栨秷
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getApplicationContext(), AdPositionEnum.other) != null) {
loadAD();
} else {
}
@@ -386,7 +388,8 @@
}
private void loadAD() {
- //
+ if (AdUtil.getAdType(this, AdPositionEnum.videoSearch) == null)
+ return;
NativeExpressAD nativeExpressAD = new NativeExpressAD(this, new ADSize(ADSize.FULL_WIDTH, ADSize.AUTO_HEIGHT),
GDTConstant.GDT_APP_ID, GDTConstant.GDT_HOME_AND_PLAY_BIG_PICTURE, new NativeExpressAD.NativeExpressADListener() {
@Override
diff --git a/MGVideo/src/com/mugua/mgvideo/ui/video/VideoRecommendAdapter.java b/MGVideo/src/com/mugua/mgvideo/ui/video/VideoRecommendAdapter.java
index ec9b678..3c636ed 100644
--- a/MGVideo/src/com/mugua/mgvideo/ui/video/VideoRecommendAdapter.java
+++ b/MGVideo/src/com/mugua/mgvideo/ui/video/VideoRecommendAdapter.java
@@ -21,8 +21,10 @@
import com.mugua.mgvideo.util.video.VideoUIUtil;
import com.qq.e.ads.nativ.NativeUnifiedADData;
import com.qq.e.ads.nativ.widget.NativeAdContainer;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.ad.ExpressAdContainer;
import com.yeshi.base.entity.video.VideoInfo;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.ExpressAdManager;
import com.yeshi.base.utils.ad.GDTConstant;
import com.yeshi.base.utils.ad.GDTNativeADUnifiedManager;
@@ -380,6 +382,9 @@
if (contentList == null || contentList.size() == 0)
return;
+ if (AdUtil.getAdType(mContext, AdPositionEnum.other) == null)
+ return;
+
GDTNativeADUnifiedManager.loadAD(columns == 3 ? GDTConstant.PID_2_VIDEO_LIST_SMALL_AD_COLUMN3 : GDTConstant.PID_2_VIDEO_LIST_SMALL_AD_COLUMN2, 1, mContext, new GDTNativeADUnifiedManager.IAdLoadListener() {
@Override
public void onSuccess(List<NativeUnifiedADData> adList) {
@@ -485,7 +490,7 @@
// params.width = itemWidth;
// }
// } else {
- params.width = getItemWidth(p,"");
+ params.width = getItemWidth(p, "");
// }
if (viewHolder instanceof VideoHolder) {
diff --git a/MGVideo/src/com/mugua/mgvideo/util/ConfigUtil.java b/MGVideo/src/com/mugua/mgvideo/util/ConfigUtil.java
index fddc993..60a711c 100644
--- a/MGVideo/src/com/mugua/mgvideo/util/ConfigUtil.java
+++ b/MGVideo/src/com/mugua/mgvideo/util/ConfigUtil.java
@@ -56,7 +56,6 @@
}
-
/**
* 淇濆瓨鎾斁鍣ㄥ璺冲崗璁�
*
diff --git a/MGVideo/src/com/mugua/mgvideo/util/ExitDialog.java b/MGVideo/src/com/mugua/mgvideo/util/ExitDialog.java
index 2a88545..eb6c506 100644
--- a/MGVideo/src/com/mugua/mgvideo/util/ExitDialog.java
+++ b/MGVideo/src/com/mugua/mgvideo/util/ExitDialog.java
@@ -14,6 +14,8 @@
import com.qq.e.ads.nativ.NativeExpressAD;
import com.qq.e.ads.nativ.NativeExpressADView;
import com.qq.e.comm.util.AdError;
+import com.yeshi.base.entity.ad.AdPositionEnum;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.GDTConstant;
import java.util.List;
@@ -121,6 +123,8 @@
// 1.鍔犺浇骞垮憡锛屽厛璁剧疆鍔犺浇涓婁笅鏂囩幆澧冨拰鏉′欢
private void nativeAd() {
+ if (AdUtil.getAdType(context, AdPositionEnum.exitApp) == null)
+ return;
NativeExpressAD nativeExpressAD = new NativeExpressAD(context, new ADSize(ADSize.FULL_WIDTH, ADSize.AUTO_HEIGHT),
GDTConstant.GDT_APP_ID, GDTConstant.GDT_EXIT_DIALOG, new NativeExpressAD.NativeExpressADListener() {
@Override
diff --git a/MGVideo/src/com/mugua/mgvideo/util/JumpActivityUtil.java b/MGVideo/src/com/mugua/mgvideo/util/JumpActivityUtil.java
deleted file mode 100644
index 7af9d1d..0000000
--- a/MGVideo/src/com/mugua/mgvideo/util/JumpActivityUtil.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.mugua.mgvideo.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.webkit.WebChromeClient;
-import android.webkit.WebViewClient;
-
-import com.alibaba.baichuan.android.trade.AlibcTrade;
-import com.alibaba.baichuan.android.trade.AlibcTradeSDK;
-import com.alibaba.baichuan.android.trade.callback.AlibcTradeCallback;
-import com.alibaba.baichuan.android.trade.model.AlibcShowParams;
-import com.alibaba.baichuan.android.trade.model.OpenType;
-import com.alibaba.baichuan.android.trade.page.AlibcDetailPage;
-import com.alibaba.baichuan.trade.biz.AlibcConstants;
-import com.alibaba.baichuan.trade.biz.applink.adapter.AlibcFailModeType;
-import com.alibaba.baichuan.trade.biz.context.AlibcTradeResult;
-import com.alibaba.baichuan.trade.biz.core.taoke.AlibcTaokeParams;
-import com.alibaba.fastjson.JSONObject;
-import com.mugua.mgvideo.entity.JumpDetail;
-import com.yeshi.base.utils.BeibeiConstant;
-import com.yeshi.base.utils.downutil.StringUtils;
-
-import org.json.JSONException;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-
-public class JumpActivityUtil {
-
- public static void jumpActivity(Context mContext,
- JumpDetail jumpDetail, JSONObject params) {
- Intent intent = null;
- org.json.JSONObject object = null;
- try {
- intent = new Intent(mContext, Class.forName(JumpActivityUtil.filterActivityName(jumpDetail.getActivity())));
- if (params != null)
- object = new org.json.JSONObject(params);
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- }
- if (object != null) {
- @SuppressWarnings("unchecked")
- Iterator<String> its = object.keys();
- while (its.hasNext()) {
- String key = its.next();
- String value = object.optString(key);
- intent.putExtra(key, value);
- }
- }
- mContext.startActivity(intent);
- }
-
- public static void jumpBaiChuan(Activity mActivity, String tbClientInfo, String url, String auctionId, AlibcShowParams alibcShowParams) {
- AlibcTaokeParams alibcTaokeParams = null;
- Map<String, String> exParams = new HashMap<>();
- exParams.put(AlibcConstants.ISV_CODE, "appisvcode");
- exParams.put("alibaba", "闃块噷宸村反");//鑷畾涔夊弬鏁伴儴鍒嗭紝鍙换鎰忓鍒犳敼
-
- if (!StringUtils.isNullOrEmpty(tbClientInfo)) {
- alibcTaokeParams = new AlibcTaokeParams("", "", "");
- alibcTaokeParams.setPid(BeibeiConstant.BAICHUAN_PID);
- org.json.JSONObject object = null;
- try {
- object = new org.json.JSONObject(tbClientInfo);
- } catch (JSONException e) {
-
- }
- String pid = object.optString("pid");
- String appKey = object.optString("appKey");
- String adZoneId = object.optString("adZoneId");
- alibcTaokeParams.setPid(pid);
- alibcTaokeParams.setAdzoneid(adZoneId);
- alibcTaokeParams.pid = pid;
- alibcTaokeParams.adzoneid = adZoneId;
- alibcTaokeParams.extraParams = new HashMap<>();
- alibcTaokeParams.extraParams.put("taokeAppkey", appKey);
- } else {
- alibcTaokeParams = new AlibcTaokeParams("", "", "");
- alibcTaokeParams.setPid(BeibeiConstant.BAICHUAN_PID);
- alibcTaokeParams.setAdzoneid(BeibeiConstant.BAICHUAN_ADZONE_ID);
- alibcTaokeParams.pid = BeibeiConstant.BAICHUAN_PID;
- alibcTaokeParams.adzoneid = BeibeiConstant.BAICHUAN_ADZONE_ID;
- alibcTaokeParams.extraParams = new HashMap<>();
- alibcTaokeParams.extraParams.put("taokeAppkey", BeibeiConstant.BAICHUAN_APPKEY);
- }
-
- if (!StringUtils.isNullOrEmpty(url)) {
- AlibcTradeUtil.openByUrl(mActivity,
- url, null, new WebViewClient(), new WebChromeClient(),
- alibcShowParams, alibcTaokeParams, null);
-
- } else {
- AlibcDetailPage basePage = new AlibcDetailPage(auctionId);
- AlibcTrade.openByBizCode(mActivity, basePage, null,
- new WebViewClient(), new WebChromeClient(), "nativeDetail", alibcShowParams,
- alibcTaokeParams, null, new AlibcTradeCallback() {
-
- @Override
- public void onTradeSuccess(AlibcTradeResult alibcTradeResult) {
-
- }
-
- @Override
- public void onFailure(int i, String s) {
-
- }
- });
- }
- }
-
- /**
- * 璺宠浆
- *
- * @param context
- * @param detail
- * @param params
- */
- public static void jumpPage(final Activity context, JumpDetail detail, JSONObject params) {
- if (context == null)
- return;
- if (detail == null)
- return;
-
- String type = detail.getType();
- switch (type) {
- case "baichuan":
- if (params == null)
- return;
- String url = params.getString("url");
- if (StringUtils.isNullOrEmpty(url))
- return;
-
- //璺宠浆鐧惧窛
- AlibcShowParams alibcShowParams = new AlibcShowParams();
- alibcShowParams.setOpenType(OpenType.Auto);
- alibcShowParams.setNativeOpenFailedMode(AlibcFailModeType.AlibcNativeFailModeJumpBROWER);
-// AlibcTrade.openByUrl(GoodsDetailActivityTB.this, "",
-// url, null, new WebViewClient(), new WebChromeClient(),
-// alibcShowParams, alibcTaokeParams, exParams, new MiDuoTradeCallback(""));
-
- AlibcTaokeParams alibcTaokeParams = new AlibcTaokeParams("", "", "");
- alibcTaokeParams.setPid(BeibeiConstant.BAICHUAN_PID);
- alibcTaokeParams.setAdzoneid(BeibeiConstant.BAICHUAN_ADZONE_ID);
- alibcTaokeParams.pid = BeibeiConstant.BAICHUAN_PID;
- alibcTaokeParams.adzoneid = BeibeiConstant.BAICHUAN_ADZONE_ID;
- alibcTaokeParams.extraParams = new HashMap<>();
- alibcTaokeParams.extraParams.put("taokeAppkey", BeibeiConstant.BAICHUAN_APPKEY);
-
- AlibcTradeSDK.setTaokeParams(alibcTaokeParams);
- AlibcTradeUtil.openByUrl(context,
- url, null, new WebViewClient(), new WebChromeClient(),
- alibcShowParams, alibcTaokeParams, null);
- break;
-
- default: {
- try {
- Intent intent = new Intent(context, Class.forName(JumpActivityUtil.filterActivityName(detail.getActivity())));
- if (params != null)
- for (Iterator<String> keys = params.keySet().iterator(); keys.hasNext(); ) {
- String key = keys.next();
- intent.putExtra(key, params.getString(key));
- }
- context.startActivity(intent);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- break;
- }
- }
-
-
- public static String filterActivityName(String activity) {
- if (activity == null)
- return null;
- return activity;
- }
-
-}
diff --git a/MGVideo/src/com/mugua/mgvideo/util/browser/BaseBWJavaInterface.java b/MGVideo/src/com/mugua/mgvideo/util/browser/BaseBWJavaInterface.java
index 019a971..1029f72 100644
--- a/MGVideo/src/com/mugua/mgvideo/util/browser/BaseBWJavaInterface.java
+++ b/MGVideo/src/com/mugua/mgvideo/util/browser/BaseBWJavaInterface.java
@@ -16,7 +16,7 @@
import com.lcjian.library.util.security.MD5Utils;
import com.umeng.analytics.MobclickAgent;
import com.mugua.mgvideo.MGVideoAPI;
-import com.mugua.mgvideo.util.JumpActivityUtil;
+import com.yeshi.base.utils.JumpActivityUtil;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/MGVideo/src/com/mugua/mgvideo/util/browser/MGJavaInterface.java b/MGVideo/src/com/mugua/mgvideo/util/browser/MGJavaInterface.java
index 0fcbd3a..075ab2e 100644
--- a/MGVideo/src/com/mugua/mgvideo/util/browser/MGJavaInterface.java
+++ b/MGVideo/src/com/mugua/mgvideo/util/browser/MGJavaInterface.java
@@ -11,7 +11,7 @@
import com.lcjian.library.util.common.StringUtils;
import com.tencent.smtt.sdk.WebView;
import com.mugua.mgvideo.util.AlibcTradeUtil;
-import com.mugua.mgvideo.util.JumpActivityUtil;
+import com.yeshi.base.utils.JumpActivityUtil;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java b/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java
index c9a6629..4aacea6 100644
--- a/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java
+++ b/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java
@@ -3,10 +3,12 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.os.Bundle;
+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
@@ -157,6 +159,8 @@
private void initData() {
Bundle bundle = getArguments();
BaiDuCPUType item = (BaiDuCPUType) bundle.getSerializable("item");
+ if (item == null)
+ return;
viewType = bundle.getInt("viewType");
bundle.clear();
mChannelId = item.getId();
diff --git a/library-base/src/main/AndroidManifest.xml b/library-base/src/main/AndroidManifest.xml
index 2eddbf6..ed48d00 100644
--- a/library-base/src/main/AndroidManifest.xml
+++ b/library-base/src/main/AndroidManifest.xml
@@ -1,5 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.yeshi.ec.base">
+ package="com.yeshi.base">
+
+ <application>
+
+ <activity
+ android:name=".ui.LoginActivity"
+ android:label="@string/app_name"></activity>
+ <activity
+ android:name=".ui.PersonInfoActivity"
+ android:label="@string/app_name"></activity>
+ <activity
+ android:name=".ui.RegisterActivity"
+ android:label="@string/app_name"></activity>
+ <activity
+ android:name=".ui.ForgetPwdActivity"
+ android:label="@string/app_name"></activity>
+
+ <activity
+ android:name=".ui.BrowserActivity"
+ android:label="@string/app_name"></activity>
+
+ </application>
</manifest>
\ No newline at end of file
diff --git a/library-base/src/main/java/com/yeshi/base/entity/ad/AdPositionEnum.java b/library-base/src/main/java/com/yeshi/base/entity/ad/AdPositionEnum.java
index 737a1b8..c161a9f 100644
--- a/library-base/src/main/java/com/yeshi/base/entity/ad/AdPositionEnum.java
+++ b/library-base/src/main/java/com/yeshi/base/entity/ad/AdPositionEnum.java
@@ -7,8 +7,7 @@
exitApp("exitApp"),//APP閫�鍑哄箍鍛�
videoSearch("videoSearch"),//鎼滅储椤靛箍鍛�
videoDetailFullVideo("videoDetailFullVideo"),//瑙嗛鍏ㄥ睆骞垮憡
- pptvNoAdReward("pptvNoAdReward"),//PPTV鏃犲箍鍛婃縺鍔辫棰�
- other("鍏朵粬骞垮憡浣�");
+ other("other");//鍏朵粬骞垮憡浣�
private String positionName;
diff --git a/library-base/src/main/java/com/yeshi/base/ui/BrowserActivity.java b/library-base/src/main/java/com/yeshi/base/ui/BrowserActivity.java
index 61983b2..489e493 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/BrowserActivity.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/BrowserActivity.java
@@ -21,7 +21,7 @@
import com.yeshi.base.utils.MGJavaInterface;
import com.yeshi.base.utils.RouteConstant;
import com.yeshi.base.utils.x5.X5WebView;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
@Route(path = RouteConstant.PATH_WEB_BROWSER)
public class BrowserActivity extends BaseActivity implements OnClickListener {
diff --git a/library-base/src/main/java/com/yeshi/base/ui/ForgetPwdActivity.java b/library-base/src/main/java/com/yeshi/base/ui/ForgetPwdActivity.java
index a0a32ad..a38e3b6 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/ForgetPwdActivity.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/ForgetPwdActivity.java
@@ -24,7 +24,7 @@
import com.yeshi.base.utils.BaseApiUtil;
import com.yeshi.base.utils.IsEmail;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
/**
* 蹇樿瀵嗙爜锛屼慨鏀瑰瘑鐮� Created by weikou2015 on 2016/10/27.
diff --git a/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java b/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java
index 5ad875b..32febd3 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java
@@ -44,7 +44,7 @@
import com.yeshi.base.utils.BaseApiUtil;
import com.yeshi.base.utils.RouteConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
@Route(path = RouteConstant.PATH_USER_LOGIN)
public class LoginActivity extends BaseActivity implements OnClickListener {
@@ -161,6 +161,7 @@
tv_register.setOnClickListener(this);
tv_login.setOnClickListener(this);
findViewById(R.id.tv_user_agreement).setOnClickListener(this);
+ findViewById(R.id.tv_privacy).setOnClickListener(this);
}
@Override
@@ -169,6 +170,10 @@
if (id == R.id.login_tv_cancel) {// 鍙栨秷
finish();
} else if (id == R.id.login_tv_qq) {// QQ鐧诲綍
+ if (!cb_user_agreement.isChecked()) {
+ SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚涓庨殣绉佹斂绛栧悗鏂瑰彲鐧婚檰");
+ return;
+ }
if (isQQClientAvailable()) {
loginType = "1";
// qq鐧诲綍閫昏緫澶勭悊 鐐瑰嚮鐧诲綍鍚庨渶瑕佹殏鏃堕攣瀹氳繑鍥為敭鍜岃繑鍥炲姛鑳� 涓嶇劧浼氭姤閿�
@@ -185,13 +190,19 @@
BrowserActivity.class);
intent.putExtra("url", getString(R.string.agreement));
startActivity(intent);
+ } else if (id == R.id.tv_privacy) {
+ Intent intent = new Intent(LoginActivity.this,
+ BrowserActivity.class);
+ intent.putExtra("url", getString(R.string.privacy));
+ startActivity(intent);
} else if (id == R.id.tv_register) {
startActivity(new Intent(LoginActivity.this, RegisterActivity.class));
} else if (id == R.id.tv_login) {
- if (cb_user_agreement.isChecked())
- emailLogin();
- else
- SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚鍚庢柟鍙櫥闄�");
+ if (!cb_user_agreement.isChecked()) {
+ SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚涓庨殣绉佹斂绛栧悗鏂瑰彲鐧婚檰");
+ return;
+ }
+ emailLogin();
}
}
diff --git a/library-base/src/main/java/com/yeshi/base/ui/PersonInfoActivity.java b/library-base/src/main/java/com/yeshi/base/ui/PersonInfoActivity.java
index 7696c2c..e2f0b12 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/PersonInfoActivity.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/PersonInfoActivity.java
@@ -29,7 +29,7 @@
import com.yeshi.base.utils.BeibeiConstant;
import com.yeshi.base.utils.SelectPicUtil;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
import org.apache.http.Header;
import org.json.JSONObject;
diff --git a/library-base/src/main/java/com/yeshi/base/ui/RegisterActivity.java b/library-base/src/main/java/com/yeshi/base/ui/RegisterActivity.java
index 93ebbd0..31db58e 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/RegisterActivity.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/RegisterActivity.java
@@ -21,7 +21,7 @@
import com.yeshi.base.utils.BaseApiUtil;
import com.yeshi.base.utils.IsEmail;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
import org.apache.http.Header;
import org.json.JSONObject;
@@ -35,335 +35,346 @@
*/
public class RegisterActivity extends BaseActivity implements
- View.OnClickListener {
+ View.OnClickListener {
- private LinearLayout ll_login_content;
- private ImageView iv_register_top;
- private EditText et_email;
- private EditText et_pwd;
- private EditText et_verfication_code;
- private TextView tv_obtain_verfication_code;
- private CheckBox cb_user_agreement;
- private TextView tv_confirm;
+ private LinearLayout ll_login_content;
+ private ImageView iv_register_top;
+ private EditText et_email;
+ private EditText et_pwd;
+ private EditText et_verfication_code;
+ private TextView tv_obtain_verfication_code;
+ private CheckBox cb_user_agreement;
+ private TextView tv_confirm;
- @Override
- protected void onCreate(Bundle arg0) {
- super.onCreate(arg0);
- setContentView(R.layout.activity_register);
- iv_register_top = (ImageView) findViewById(R.id.iv_register_top);
- et_email = (EditText) findViewById(R.id.et_name);
- et_pwd = (EditText) findViewById(R.id.et_pwd);
- et_verfication_code = (EditText) findViewById(R.id.et_verfication_code);
- tv_obtain_verfication_code = (TextView) findViewById(R.id.tv_obtain_verfication_code);
- cb_user_agreement = (CheckBox) findViewById(R.id.cb_user_agreement);
- tv_confirm = (TextView) findViewById(R.id.tv_confirm);
- ll_login_content = (LinearLayout) findViewById(R.id.ll_login_content);
+ @Override
+ protected void onCreate(Bundle arg0) {
+ super.onCreate(arg0);
+ setContentView(R.layout.activity_register);
+ iv_register_top = (ImageView) findViewById(R.id.iv_register_top);
+ et_email = (EditText) findViewById(R.id.et_name);
+ et_pwd = (EditText) findViewById(R.id.et_pwd);
+ et_verfication_code = (EditText) findViewById(R.id.et_verfication_code);
+ tv_obtain_verfication_code = (TextView) findViewById(R.id.tv_obtain_verfication_code);
+ cb_user_agreement = (CheckBox) findViewById(R.id.cb_user_agreement);
+ tv_confirm = (TextView) findViewById(R.id.tv_confirm);
+ ll_login_content = (LinearLayout) findViewById(R.id.ll_login_content);
- int w = View.MeasureSpec.makeMeasureSpec(0,
- View.MeasureSpec.UNSPECIFIED);
- int h = View.MeasureSpec.makeMeasureSpec(0,
- View.MeasureSpec.UNSPECIFIED);
- ll_login_content.measure(w, h);
- int width = ll_login_content.getMeasuredWidth();
- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width,
- (int) (width * 0.434));
- params.gravity = Gravity.CENTER_HORIZONTAL;
- iv_register_top.setLayoutParams(params);
+ int w = View.MeasureSpec.makeMeasureSpec(0,
+ View.MeasureSpec.UNSPECIFIED);
+ int h = View.MeasureSpec.makeMeasureSpec(0,
+ View.MeasureSpec.UNSPECIFIED);
+ ll_login_content.measure(w, h);
+ int width = ll_login_content.getMeasuredWidth();
+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width,
+ (int) (width * 0.434));
+ params.gravity = Gravity.CENTER_HORIZONTAL;
+ iv_register_top.setLayoutParams(params);
- et_email.addTextChangedListener(new TextWatcher() {
+ et_email.addTextChangedListener(new TextWatcher() {
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
+ @Override
+ public void onTextChanged(CharSequence arg0, int arg1, int arg2,
+ int arg3) {
- }
+ }
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
+ @Override
+ public void beforeTextChanged(CharSequence arg0, int arg1,
+ int arg2, int arg3) {
- }
+ }
- @Override
- public void afterTextChanged(Editable arg0) {
- // et_email.getText().toString()
- if (!StringUtils.isEmpty(et_verfication_code.getText()
- .toString())
- && !StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
+ @Override
+ public void afterTextChanged(Editable arg0) {
+ // et_email.getText().toString()
+ if (!StringUtils.isEmpty(et_verfication_code.getText()
+ .toString())
+ && !StringUtils.isEmpty(et_pwd.getText().toString())
+ && !StringUtils.isEmpty(arg0.toString())) {
+ tv_confirm.setBackground(getResources().getDrawable(
+ R.drawable.shape_login2));
+ } else {
+ tv_confirm.setBackground(getResources().getDrawable(
+ R.drawable.shape_login1));
+ }
- if (!StringUtils.isEmpty(arg0.toString())) {
- tv_obtain_verfication_code.setBackground(getResources()
- .getDrawable(R.drawable.shape_login2));
- } else {
- tv_obtain_verfication_code.setBackground(getResources()
- .getDrawable(R.drawable.shape_login1));
- }
+ if (!StringUtils.isEmpty(arg0.toString())) {
+ tv_obtain_verfication_code.setBackground(getResources()
+ .getDrawable(R.drawable.shape_login2));
+ } else {
+ tv_obtain_verfication_code.setBackground(getResources()
+ .getDrawable(R.drawable.shape_login1));
+ }
- }
- });
- et_verfication_code.addTextChangedListener(new TextWatcher() {
+ }
+ });
+ et_verfication_code.addTextChangedListener(new TextWatcher() {
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
+ @Override
+ public void onTextChanged(CharSequence arg0, int arg1, int arg2,
+ int arg3) {
- }
+ }
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
+ @Override
+ public void beforeTextChanged(CharSequence arg0, int arg1,
+ int arg2, int arg3) {
- }
+ }
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_email.getText().toString())
- && !StringUtils.isEmpty(et_pwd.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
+ @Override
+ public void afterTextChanged(Editable arg0) {
+ if (!StringUtils.isEmpty(et_email.getText().toString())
+ && !StringUtils.isEmpty(et_pwd.getText().toString())
+ && !StringUtils.isEmpty(arg0.toString())) {
+ tv_confirm.setBackground(getResources().getDrawable(
+ R.drawable.shape_login2));
+ } else {
+ tv_confirm.setBackground(getResources().getDrawable(
+ R.drawable.shape_login1));
+ }
- }
- });
+ }
+ });
- et_pwd.addTextChangedListener(new TextWatcher() {
+ et_pwd.addTextChangedListener(new TextWatcher() {
- @Override
- public void onTextChanged(CharSequence arg0, int arg1, int arg2,
- int arg3) {
+ @Override
+ public void onTextChanged(CharSequence arg0, int arg1, int arg2,
+ int arg3) {
- }
+ }
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1,
- int arg2, int arg3) {
+ @Override
+ public void beforeTextChanged(CharSequence arg0, int arg1,
+ int arg2, int arg3) {
- }
+ }
- @Override
- public void afterTextChanged(Editable arg0) {
- if (!StringUtils.isEmpty(et_verfication_code.getText()
- .toString())
- && !StringUtils.isEmpty(et_email.getText().toString())
- && !StringUtils.isEmpty(arg0.toString())) {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login2));
- } else {
- tv_confirm.setBackground(getResources().getDrawable(
- R.drawable.shape_login1));
- }
- }
- });
+ @Override
+ public void afterTextChanged(Editable arg0) {
+ if (!StringUtils.isEmpty(et_verfication_code.getText()
+ .toString())
+ && !StringUtils.isEmpty(et_email.getText().toString())
+ && !StringUtils.isEmpty(arg0.toString())) {
+ tv_confirm.setBackground(getResources().getDrawable(
+ R.drawable.shape_login2));
+ } else {
+ tv_confirm.setBackground(getResources().getDrawable(
+ R.drawable.shape_login1));
+ }
+ }
+ });
- tv_obtain_verfication_code.setOnClickListener(this);
- tv_confirm.setOnClickListener(this);
- findViewById(R.id.tv_back).setOnClickListener(this);
- findViewById(R.id.tv_user_agreement).setOnClickListener(this);
- }
+ tv_obtain_verfication_code.setOnClickListener(this);
+ tv_confirm.setOnClickListener(this);
+ findViewById(R.id.tv_back).setOnClickListener(this);
+ findViewById(R.id.tv_user_agreement).setOnClickListener(this);
+ findViewById(R.id.tv_privacy).setOnClickListener(this);
+ }
- @Override
- public void onClick(View v) {
- int id = v.getId();
- if (id == R.id.tv_back) {
- finish();
- } else if (id == R.id.tv_user_agreement) {
- Intent intent = new Intent(RegisterActivity.this,
- BrowserActivity.class);
- intent.putExtra("url", getString(R.string.agreement));
- startActivity(intent);
- } else if (id == R.id.tv_obtain_verfication_code) {
- String email = et_email.getText().toString();
- if (StringUtils.isEmpty(email)) {
- SingleToast.showToast(RegisterActivity.this, "璇峰厛杈撳叆閭璐﹀彿");
- } else {
- Matcher m = IsEmail.isEmailAddress().matcher(email);
- if (m.matches()) {
- getVerficationCode(email);
- } else {
- SingleToast.showToast(RegisterActivity.this,
- "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
- return;
- }
- }
- } else if (id == R.id.tv_confirm) {
- String email1 = et_email.getText().toString();
- String pwd = et_pwd.getText().toString();
- String verficationCode = et_verfication_code.getText().toString();
- if (StringUtils.isEmpty(email1)) {
- SingleToast.showToast(RegisterActivity.this, "璇峰厛杈撳叆閭璐﹀彿");
- return;
- } else {
- Matcher m = IsEmail.isEmailAddress().matcher(email1);
- if (!m.matches()) {
- SingleToast.showToast(RegisterActivity.this,
- "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
- return;
- }
- }
- if (StringUtils.isEmpty(pwd)) {
- SingleToast.showToast(RegisterActivity.this, "瀵嗙爜涓嶈兘涓虹┖");
- return;
- }
- if (pwd.length() < 6) {
- SingleToast.showToast(RegisterActivity.this, "瀵嗙爜闀垮害涓嶈兘浣庝簬6浣�");
- return;
- }
- if (StringUtils.isEmpty(verficationCode)) {
- SingleToast.showToast(RegisterActivity.this, "楠岃瘉鐮佷笉鑳戒负绌�");
- return;
- }
- userRegister();
- }
- }
+ @Override
+ public void onClick(View v) {
+ int id = v.getId();
+ if (id == R.id.tv_back) {
+ finish();
+ } else if (id == R.id.tv_user_agreement) {
+ Intent intent = new Intent(RegisterActivity.this,
+ BrowserActivity.class);
+ intent.putExtra("url", getString(R.string.agreement));
+ startActivity(intent);
+ } else if (id == R.id.tv_privacy) {
+ Intent intent = new Intent(RegisterActivity.this,
+ BrowserActivity.class);
+ intent.putExtra("url", getString(R.string.privacy));
+ startActivity(intent);
+ } else if (id == R.id.tv_obtain_verfication_code) {
+ String email = et_email.getText().toString();
+ if (StringUtils.isEmpty(email)) {
+ SingleToast.showToast(RegisterActivity.this, "璇峰厛杈撳叆閭璐﹀彿");
+ } else {
+ Matcher m = IsEmail.isEmailAddress().matcher(email);
+ if (m.matches()) {
+ getVerficationCode(email);
+ } else {
+ SingleToast.showToast(RegisterActivity.this,
+ "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
+ return;
+ }
+ }
+ } else if (id == R.id.tv_confirm) {
+ if (!cb_user_agreement.isChecked()) {
+ SingleToast.showToast(this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚涓庨殣绉佹斂绛栧悗鏂瑰彲娉ㄥ唽");
+ return;
+ }
- private void userRegister() {
- SharedPreferences sp = getSharedPreferences("user",
- Context.MODE_PRIVATE);
- final String uid = sp.getString("uid", "");
- BaseApiUtil.emailRegister(this, uid, et_email.getText().toString(),
- et_pwd.getText().toString(), et_verfication_code.getText()
- .toString(), "鏃犲悕姘�", new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SingleToast.showToast(RegisterActivity.this,
- "娉ㄥ唽鎴愬姛锛�");
- emailLogin(et_email.getText().toString(), et_pwd
- .getText().toString(), uid);
- } else {
- SingleToast.showToast(RegisterActivity.this,
- jsonObject.optString("Error") + ",娉ㄥ唽澶辫触!");
- }
- }
+ String email1 = et_email.getText().toString();
+ String pwd = et_pwd.getText().toString();
+ String verficationCode = et_verfication_code.getText().toString();
+ if (StringUtils.isEmpty(email1)) {
+ SingleToast.showToast(RegisterActivity.this, "璇峰厛杈撳叆閭璐﹀彿");
+ return;
+ } else {
+ Matcher m = IsEmail.isEmailAddress().matcher(email1);
+ if (!m.matches()) {
+ SingleToast.showToast(RegisterActivity.this,
+ "杈撳叆鐨勯偖绠辫处鍙锋湁璇紝璇锋煡璇侊紒");
+ return;
+ }
+ }
+ if (StringUtils.isEmpty(pwd)) {
+ SingleToast.showToast(RegisterActivity.this, "瀵嗙爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (pwd.length() < 6) {
+ SingleToast.showToast(RegisterActivity.this, "瀵嗙爜闀垮害涓嶈兘浣庝簬6浣�");
+ return;
+ }
+ if (StringUtils.isEmpty(verficationCode)) {
+ SingleToast.showToast(RegisterActivity.this, "楠岃瘉鐮佷笉鑳戒负绌�");
+ return;
+ }
+ userRegister();
+ }
+ }
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers, responseString,
- throwable);
- SingleToast.showToast(RegisterActivity.this,
- "娉ㄥ唽澶辫触锛岃閲嶆柊娉ㄥ唽");
- }
- });
- }
+ private void userRegister() {
+ SharedPreferences sp = getSharedPreferences("user",
+ Context.MODE_PRIVATE);
+ final String uid = sp.getString("uid", "");
+ BaseApiUtil.emailRegister(this, uid, et_email.getText().toString(),
+ et_pwd.getText().toString(), et_verfication_code.getText()
+ .toString(), "鏃犲悕姘�", new BasicTextHttpResponseHandler() {
+ @Override
+ public void onSuccessPerfect(int statusCode,
+ Header[] headers, JSONObject jsonObject)
+ throws Exception {
+ if (jsonObject.optBoolean("IsPost")) {
+ SingleToast.showToast(RegisterActivity.this,
+ "娉ㄥ唽鎴愬姛锛�");
+ emailLogin(et_email.getText().toString(), et_pwd
+ .getText().toString(), uid);
+ } else {
+ SingleToast.showToast(RegisterActivity.this,
+ jsonObject.optString("Error") + ",娉ㄥ唽澶辫触!");
+ }
+ }
- /**
- * 娉ㄥ唽鎴愬姛鍚庣櫥闄嗭紝鑾峰彇鐧诲綍淇℃伅
- */
- /**
- * Email鐧婚檰
- */
- private void emailLogin(String email, String pwd, String uid) {
- BaseApiUtil.emailLogin(RegisterActivity.this, uid, email, pwd,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SharedPreferences sp = getSharedPreferences("user",
- MODE_PRIVATE);
- SharedPreferences.Editor edit = sp.edit();
- edit.putString("portrait", jsonObject
- .optJSONObject("Data")
- .optString("Portrait"));
- edit.putString("LoginUid", jsonObject
- .getJSONObject("Data").getString("Id"));
- edit.putString(
- "name",
- jsonObject.optJSONObject("Data").optString(
- "NickName"));
- edit.commit();
- SingleToast
- .showToast(RegisterActivity.this, "鐧婚檰鎴愬姛");
- Intent intent = new Intent(RegisterActivity.this,
- PersonInfoActivity.class);
- startActivity(intent);
- finish();
- } else {
- SingleToast
- .showToast(RegisterActivity.this, "鐧婚檰澶辫触");
- }
- }
+ @Override
+ public void onFailure(int statusCode, Header[] headers,
+ String responseString, Throwable throwable) {
+ super.onFailure(statusCode, headers, responseString,
+ throwable);
+ SingleToast.showToast(RegisterActivity.this,
+ "娉ㄥ唽澶辫触锛岃閲嶆柊娉ㄥ唽");
+ }
+ });
+ }
- @Override
- public void onFailure(int statusCode, Header[] headers,
- String responseString, Throwable throwable) {
- super.onFailure(statusCode, headers, responseString,
- throwable);
- SingleToast.showToast(RegisterActivity.this, "鐧婚檰澶辫触");
- }
- });
+ /**
+ * 娉ㄥ唽鎴愬姛鍚庣櫥闄嗭紝鑾峰彇鐧诲綍淇℃伅
+ */
+ /**
+ * Email鐧婚檰
+ */
+ private void emailLogin(String email, String pwd, String uid) {
+ BaseApiUtil.emailLogin(RegisterActivity.this, uid, email, pwd,
+ new BasicTextHttpResponseHandler() {
+ @Override
+ public void onSuccessPerfect(int statusCode,
+ Header[] headers, JSONObject jsonObject)
+ throws Exception {
+ if (jsonObject.optBoolean("IsPost")) {
+ SharedPreferences sp = getSharedPreferences("user",
+ MODE_PRIVATE);
+ SharedPreferences.Editor edit = sp.edit();
+ edit.putString("portrait", jsonObject
+ .optJSONObject("Data")
+ .optString("Portrait"));
+ edit.putString("LoginUid", jsonObject
+ .getJSONObject("Data").getString("Id"));
+ edit.putString(
+ "name",
+ jsonObject.optJSONObject("Data").optString(
+ "NickName"));
+ edit.commit();
+ SingleToast
+ .showToast(RegisterActivity.this, "鐧婚檰鎴愬姛");
+ Intent intent = new Intent(RegisterActivity.this,
+ PersonInfoActivity.class);
+ startActivity(intent);
+ finish();
+ } else {
+ SingleToast
+ .showToast(RegisterActivity.this, "鐧婚檰澶辫触");
+ }
+ }
- }
+ @Override
+ public void onFailure(int statusCode, Header[] headers,
+ String responseString, Throwable throwable) {
+ super.onFailure(statusCode, headers, responseString,
+ throwable);
+ SingleToast.showToast(RegisterActivity.this, "鐧婚檰澶辫触");
+ }
+ });
- Timer timer;
- int timecount = 59;
+ }
- private void getVerficationCode(String email) {
- timer = new Timer();
- timer.schedule(new MyTask(), 1000, 1000);
- SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
- String uid = sp.getString("uid", "");
- BaseApiUtil.getVerficationCode(RegisterActivity.this, uid, email,
- new BasicTextHttpResponseHandler() {
- @Override
- public void onSuccessPerfect(int statusCode,
- Header[] headers, JSONObject jsonObject)
- throws Exception {
- if (jsonObject.optBoolean("IsPost")) {
- SingleToast.showToast(RegisterActivity.this,
- "鑾峰彇楠岃瘉鐮佹垚鍔燂紝璇锋墦寮�閭鏌ョ湅锛�");
- } else {
- SingleToast.showToast(RegisterActivity.this,
- "鑾峰彇楠岃瘉鐮佸け璐�,璇烽噸鏂拌幏鍙栵紒");
- handler.sendEmptyMessage(1);
- }
- }
- });
- }
+ Timer timer;
+ int timecount = 59;
- class MyTask extends TimerTask {
- @Override
- public void run() {
- if (timecount > 0) {
- handler.sendEmptyMessage(0);
- } else {
- handler.sendEmptyMessage(1);
- }
- }
- }
+ private void getVerficationCode(String email) {
+ timer = new Timer();
+ timer.schedule(new MyTask(), 1000, 1000);
+ SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
+ String uid = sp.getString("uid", "");
+ BaseApiUtil.getVerficationCode(RegisterActivity.this, uid, email,
+ new BasicTextHttpResponseHandler() {
+ @Override
+ public void onSuccessPerfect(int statusCode,
+ Header[] headers, JSONObject jsonObject)
+ throws Exception {
+ if (jsonObject.optBoolean("IsPost")) {
+ SingleToast.showToast(RegisterActivity.this,
+ "鑾峰彇楠岃瘉鐮佹垚鍔燂紝璇锋墦寮�閭鏌ョ湅锛�");
+ } else {
+ SingleToast.showToast(RegisterActivity.this,
+ "鑾峰彇楠岃瘉鐮佸け璐�,璇烽噸鏂拌幏鍙栵紒");
+ handler.sendEmptyMessage(1);
+ }
+ }
+ });
+ }
- Handler handler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- switch (msg.what) {
- case 0:
- tv_obtain_verfication_code.setClickable(false);
- tv_obtain_verfication_code.setText("閲嶆柊鍙戦��(" + timecount + "s)");
- timecount--;
- break;
- case 1:
- timer.cancel();
- tv_obtain_verfication_code.setText("鑾峰彇楠岃瘉鐮�");
- tv_obtain_verfication_code.setClickable(true);
- timecount = 59;
- break;
- }
- }
- };
+ class MyTask extends TimerTask {
+ @Override
+ public void run() {
+ if (timecount > 0) {
+ handler.sendEmptyMessage(0);
+ } else {
+ handler.sendEmptyMessage(1);
+ }
+ }
+ }
+
+ Handler handler = new Handler() {
+ @Override
+ public void handleMessage(Message msg) {
+ super.handleMessage(msg);
+ switch (msg.what) {
+ case 0:
+ tv_obtain_verfication_code.setClickable(false);
+ tv_obtain_verfication_code.setText("閲嶆柊鍙戦��(" + timecount + "s)");
+ timecount--;
+ break;
+ case 1:
+ timer.cancel();
+ tv_obtain_verfication_code.setText("鑾峰彇楠岃瘉鐮�");
+ tv_obtain_verfication_code.setClickable(true);
+ timecount = 59;
+ break;
+ }
+ }
+ };
}
diff --git a/library-base/src/main/java/com/yeshi/base/ui/dialog/LoadingDialogUtil.java b/library-base/src/main/java/com/yeshi/base/ui/dialog/LoadingDialogUtil.java
index 9f16b5e..b88fba3 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/dialog/LoadingDialogUtil.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/dialog/LoadingDialogUtil.java
@@ -7,7 +7,7 @@
import android.widget.TextView;
import com.lcjian.library.util.common.StringUtils;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
/**
* 鐢ㄦ埛鍗忚寮规
diff --git a/library-base/src/main/java/com/yeshi/base/utils/BeibeiConstant.java b/library-base/src/main/java/com/yeshi/base/utils/BeibeiConstant.java
index 6e15d62..c786ce0 100644
--- a/library-base/src/main/java/com/yeshi/base/utils/BeibeiConstant.java
+++ b/library-base/src/main/java/com/yeshi/base/utils/BeibeiConstant.java
@@ -23,8 +23,8 @@
return true;// 娴嬭瘯鏃跺叧闂唬鐞嗛檺鍒�
}
- public static final String QQ_ID = "1104492673";
- public static final String QQ_KEY = "AI6ri4IcDhsacEoP";
+// public static final String QQ_ID = "1104492673";
+// public static final String QQ_KEY = "AI6ri4IcDhsacEoP";
public static final String BAICHUAN_APPKEY = "24980167";
@@ -33,7 +33,6 @@
public static final boolean DEBUG = false;
public static final boolean ISHUAWEI = true;
- public static boolean ADSHOW = true;
/**
* 澶村儚鑾峰彇璺姴鍙兘涓嶅畬鏁达紝闇�瑕佹墜鍔ㄦ坊鍔犲畬鏁�
diff --git a/library-base/src/main/java/com/yeshi/base/utils/JumpActivityUtil.java b/library-base/src/main/java/com/yeshi/base/utils/JumpActivityUtil.java
index 6eabd6c..531c88b 100644
--- a/library-base/src/main/java/com/yeshi/base/utils/JumpActivityUtil.java
+++ b/library-base/src/main/java/com/yeshi/base/utils/JumpActivityUtil.java
@@ -18,6 +18,7 @@
import com.alibaba.baichuan.trade.biz.core.taoke.AlibcTaokeParams;
import com.alibaba.fastjson.JSONObject;
import com.yeshi.base.entity.JumpDetail;
+import com.yeshi.base.ui.BrowserActivity;
import com.yeshi.base.utils.downutil.StringUtils;
import org.json.JSONException;
@@ -175,7 +176,10 @@
public static String filterActivityName(String activity) {
if (activity == null)
return null;
- return activity;
+ if ("com.weikou.beibeivideo.ui.mine.BrowserActivity".equalsIgnoreCase(activity)) {
+ return BrowserActivity.class.getName();
+ }
+ return activity.replace("com.weikou.beibeivideo", "com.mugua.mgvideo");
}
}
diff --git a/library-base/src/main/java/com/yeshi/base/utils/RouteConstant.java b/library-base/src/main/java/com/yeshi/base/utils/RouteConstant.java
index afb0bfb..479f29a 100644
--- a/library-base/src/main/java/com/yeshi/base/utils/RouteConstant.java
+++ b/library-base/src/main/java/com/yeshi/base/utils/RouteConstant.java
@@ -7,7 +7,7 @@
public final static String PATH_WEB_BROWSER = "/web/browser";
- public final static String PATH_VIDEO_SEARCH_RESULT = "/video/search/result";
+ public final static String PATH_VIDEO_SEARCH_RESULT = "/videosearch/result";
public final static String PATH_VIDEO_DETAIL = "/video/detail";
diff --git a/library-base/src/main/java/com/yeshi/base/utils/ad/GDTConstant.java b/library-base/src/main/java/com/yeshi/base/utils/ad/GDTConstant.java
index 4fa3f7c..247184d 100644
--- a/library-base/src/main/java/com/yeshi/base/utils/ad/GDTConstant.java
+++ b/library-base/src/main/java/com/yeshi/base/utils/ad/GDTConstant.java
@@ -33,9 +33,6 @@
//褰辫璞嗘縺鍔辫棰�
public static String PID_2_GOLDCORN_REWARD = "9051467743649673";
- //閫�鍑哄箍鍛�
- public static String PID_2_EXIT = "6091485426868623";
-
//鎼滅储
public static final String GDT_HOME_AND_PLAY_BIG_PICTURE = "3041305616723820";
diff --git a/library-base/src/main/java/com/yeshi/base/utils/ad/TTAdManagerHolder.java b/library-base/src/main/java/com/yeshi/base/utils/ad/TTAdManagerHolder.java
index a4f9939..c3b1ca0 100644
--- a/library-base/src/main/java/com/yeshi/base/utils/ad/TTAdManagerHolder.java
+++ b/library-base/src/main/java/com/yeshi/base/utils/ad/TTAdManagerHolder.java
@@ -6,7 +6,7 @@
import com.bytedance.sdk.openadsdk.TTAdConstant;
import com.bytedance.sdk.openadsdk.TTAdManager;
import com.bytedance.sdk.openadsdk.TTAdSdk;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
/**
* 鍙互鐢ㄤ竴涓崟渚嬫潵淇濆瓨TTAdManager瀹炰緥锛屽湪闇�瑕佸垵濮嬪寲sdk鐨勬椂鍊欒皟鐢�
@@ -41,7 +41,7 @@
private static TTAdConfig buildConfig(Context context) {
return new TTAdConfig.Builder()
- .appId(CSJConstant.APP_ID)
+ .appId(context.getString(R.string.ad_csj_app_id))
.useTextureView(true) //浣跨敤TextureView鎺т欢鎾斁瑙嗛,榛樿涓篠urfaceView,褰撴湁SurfaceView鍐茬獊鐨勫満鏅紝鍙互浣跨敤TextureView
.appName(context.getString(R.string.app_name))
.titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
diff --git a/library-base/src/main/res/layout/act_login.xml b/library-base/src/main/res/layout/act_login.xml
index 7e8cbfe..9fd8864 100644
--- a/library-base/src/main/res/layout/act_login.xml
+++ b/library-base/src/main/res/layout/act_login.xml
@@ -128,16 +128,31 @@
android:layout_gravity="center_vertical"
android:background="@drawable/selector_user_agreement_checkbox"
android:button="@null"
- android:checked="true"
+ android:checked="false"
android:gravity="center" />
<TextView
android:id="@+id/tv_user_agreement"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
+ android:text="鐢ㄦ埛浣跨敤鍗忚"
+ android:textColor="@color/blue4" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="&"
+ android:textColor="@color/gray" />
+
+ <TextView
+ android:id="@+id/tv_privacy"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/user_agreement"
+ android:text="闅愮鏀跨瓥"
android:textColor="@color/blue4" />
<TextView
diff --git a/library-base/src/main/res/layout/activity_register.xml b/library-base/src/main/res/layout/activity_register.xml
index b24d117..407fd41 100644
--- a/library-base/src/main/res/layout/activity_register.xml
+++ b/library-base/src/main/res/layout/activity_register.xml
@@ -171,7 +171,7 @@
android:layout_gravity="center_vertical"
android:background="@drawable/selector_user_agreement_checkbox"
android:button="@null"
- android:checked="true"
+ android:checked="false"
android:gravity="center" />
<TextView
@@ -179,7 +179,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
- android:text="@string/user_agreement"
+ android:text="鐢ㄦ埛浣跨敤鍗忚"
+ android:textColor="@color/blue4" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="&"
+ android:textColor="@color/gray" />
+
+ <TextView
+ android:id="@+id/tv_privacy"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="闅愮鏀跨瓥"
android:textColor="@color/blue4" />
</LinearLayout>
diff --git a/library-base/src/main/res/values/strings.xml b/library-base/src/main/res/values/strings.xml
index 48e8ae9..37580b3 100644
--- a/library-base/src/main/res/values/strings.xml
+++ b/library-base/src/main/res/values/strings.xml
@@ -1,7 +1,11 @@
<resources>
<string name="agreement" translatable="false">http://111.231.250.166/mugua/userAgreenment.html</string>
+ <string name="privacy" translatable="false">http://111.231.250.166/mugua/userAgreenment.html</string>
<string name="rule_email">0123456789abcdefghijklmnopqrstuvwxyz@.</string>
<string name="rule_password">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ`卢!"拢$%^*()~=#{}[];':,./?/*-_+<>@&</string>
<string name="user_agreement">鐢ㄦ埛浣跨敤鍗忚&闅愮鏉℃</string>
+ <!-- 骞垮憡 -->
+ <string name="ad_csj_app_id">5115334</string>
+ <string name="ad_gdt_app_id">1106112837</string>
</resources>
\ No newline at end of file
diff --git a/library-common/src/com/lcjian/library/util/common/PackageUtils2.java b/library-common/src/com/lcjian/library/util/common/PackageUtils2.java
index e02eb1e..7240e71 100644
--- a/library-common/src/com/lcjian/library/util/common/PackageUtils2.java
+++ b/library-common/src/com/lcjian/library/util/common/PackageUtils2.java
@@ -26,10 +26,10 @@
}
return false;
}
-
+
/**
* 鑾峰彇versionCode
- *
+ *
* @param context
* @return 鐗堟湰鍙�
*/
@@ -42,4 +42,8 @@
return 0;
}
}
+
+ public static String getPackageName(Context context) {
+ return context.getPackageName();
+ }
}
diff --git a/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultActivity.java b/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultActivity.java
index c4d0302..707412f 100644
--- a/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultActivity.java
+++ b/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultActivity.java
@@ -37,12 +37,14 @@
import com.qq.e.ads.nativ.NativeUnifiedAD;
import com.qq.e.ads.nativ.NativeUnifiedADData;
import com.qq.e.comm.util.AdError;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.ad.ExpressAdContainer;
import com.yeshi.base.entity.video.VideoContent;
import com.yeshi.base.entity.video.VideoInfo;
import com.yeshi.base.entity.video.VideoType;
import com.yeshi.base.ui.BaseActivity;
import com.yeshi.base.utils.RouteConstant;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.ExpressAdManager;
import com.yeshi.base.utils.ad.GDTConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
@@ -417,15 +419,16 @@
if (albumCount >= 1) {
VideoContent videoContent = VideoContent.createAdContent(adList.get(0));
- mVideoInfos.add(1, videoContent);
- adapter.notifyItemInserted(1);
+ mVideoInfos.add(0, videoContent);
+ adapter.notifyItemInserted(0);
}
}
//鎷夊彇2.0鐨勮嚜娓叉煋骞垮憡
private void loadAd() {
- //TODO 濉厖骞垮憡ID
+ if (AdUtil.getAdType(getApplicationContext(), AdPositionEnum.other) == null)
+ return;
String pid = GDTConstant.PID_2_SEARCH_RESULT_ALBUM;
NativeUnifiedAD mAdManager = new NativeUnifiedAD(this, pid, new NativeADUnifiedListener() {
diff --git a/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultAdapter.java b/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultAdapter.java
index 4d699d9..1b638dc 100644
--- a/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultAdapter.java
+++ b/library-search/src/main/java/com/yeshi/ec/search/ui/SearchResultAdapter.java
@@ -1,7 +1,6 @@
package com.yeshi.ec.search.ui;
import android.app.Activity;
-import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.text.SpannableString;
@@ -24,7 +23,6 @@
import com.bumptech.glide.request.RequestOptions;
import com.lcjian.library.util.common.DimenUtils;
import com.lcjian.library.util.common.StringUtils;
-import com.lcjian.library.util.glide.GlideRoundTransform;
import com.lcjian.library.widget.RatioLayout;
import com.qq.e.ads.nativ.NativeADEventListener;
import com.qq.e.ads.nativ.NativeUnifiedADData;
@@ -289,7 +287,7 @@
@Override
public void run() {
try {
- Glide.with(mContext).load(simpleVideoHolder.rl_picture.getTag() + "").apply(new RequestOptions().centerCrop()).transition(withCrossFade()).transform(new GlideRoundTransform(mContext, 6)).placeholder(R.drawable.shape_video_list_cover_placeholder).into(simpleVideoHolder.iv_movie_cover);
+ Glide.with(mContext).load(simpleVideoHolder.rl_picture.getTag() + "").apply(new RequestOptions().centerCrop()).transition(withCrossFade()).placeholder(R.drawable.shape_video_list_cover_placeholder).into(simpleVideoHolder.iv_movie_cover);
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
diff --git a/library-search/src/main/res/drawable-xhdpi/icon_video_vip.png b/library-search/src/main/res/drawable-xhdpi/icon_video_vip.png
index dad07e0..5db0255 100644
--- a/library-search/src/main/res/drawable-xhdpi/icon_video_vip.png
+++ b/library-search/src/main/res/drawable-xhdpi/icon_video_vip.png
Binary files differ
diff --git a/library-search/src/main/res/drawable/shape_video_detail_episode_selected.xml b/library-search/src/main/res/drawable/shape_video_detail_episode_selected.xml
index 60a7aa8..2a7abfb 100644
--- a/library-search/src/main/res/drawable/shape_video_detail_episode_selected.xml
+++ b/library-search/src/main/res/drawable/shape_video_detail_episode_selected.xml
@@ -3,7 +3,7 @@
android:shape="rectangle">
<solid android:color="#0051F5" />
- <corners android:radius="5dp" />
-
+ <corners android:radius="10dp" />
+ <stroke android:width="1px" android:color="#E1E1E1"></stroke>
</shape>
\ No newline at end of file
diff --git a/library-search/src/main/res/drawable/shape_video_detail_episode_unselected.xml b/library-search/src/main/res/drawable/shape_video_detail_episode_unselected.xml
index 861a583..6aaad97 100644
--- a/library-search/src/main/res/drawable/shape_video_detail_episode_unselected.xml
+++ b/library-search/src/main/res/drawable/shape_video_detail_episode_unselected.xml
@@ -2,5 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/video_episode_bg_color" />
- <corners android:radius="5dp" />
+ <corners android:radius="10dp" />
+ <stroke android:width="1px" android:color="#E1E1E1"></stroke>
</shape>
\ No newline at end of file
diff --git a/library-search/src/main/res/layout/item_album_list_ad.xml b/library-search/src/main/res/layout/item_album_list_ad.xml
index 0f17e90..f3933e8 100644
--- a/library-search/src/main/res/layout/item_album_list_ad.xml
+++ b/library-search/src/main/res/layout/item_album_list_ad.xml
@@ -108,12 +108,12 @@
android:id="@+id/tv_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/shape_video_search_result_album_play"
- android:paddingLeft="30dp"
- android:paddingTop="6dp"
android:layout_gravity="right"
- android:paddingRight="30dp"
- android:paddingBottom="6dp"
+ android:background="@drawable/shape_video_search_result_album_play"
+ android:paddingLeft="20dp"
+ android:paddingTop="7dp"
+ android:paddingRight="20dp"
+ android:paddingBottom="7dp"
android:text="鏌ョ湅璇︽儏"
android:textColor="@color/white"
android:textSize="12sp" />
diff --git a/library-search/src/main/res/layout/item_video_search_result_album.xml b/library-search/src/main/res/layout/item_video_search_result_album.xml
index 26f4d8f..30e66c5 100644
--- a/library-search/src/main/res/layout/item_video_search_result_album.xml
+++ b/library-search/src/main/res/layout/item_video_search_result_album.xml
@@ -72,6 +72,7 @@
<ImageView
+ android:layout_marginRight="3dp"
android:id="@+id/iv_vip"
android:layout_width="29.5dp"
android:layout_height="17.5dp"
@@ -178,10 +179,10 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@drawable/shape_video_search_result_album_play"
- android:paddingLeft="30dp"
- android:paddingTop="6dp"
- android:paddingRight="30dp"
- android:paddingBottom="6dp"
+ android:paddingLeft="20dp"
+ android:paddingTop="7dp"
+ android:paddingRight="20dp"
+ android:paddingBottom="7dp"
android:text="绔嬪嵆鎾斁"
android:textColor="@color/white"
android:textSize="12sp" />
@@ -196,7 +197,7 @@
<LinearLayout
android:id="@+id/ll_videos"
android:layout_width="match_parent"
- android:layout_height="30dp"
+ android:layout_height="40dp"
android:layout_marginTop="8dp">
<TextView
diff --git a/library-search/src/main/res/layout/item_video_search_result_video.xml b/library-search/src/main/res/layout/item_video_search_result_video.xml
index ab92b30..4dc36e6 100644
--- a/library-search/src/main/res/layout/item_video_search_result_video.xml
+++ b/library-search/src/main/res/layout/item_video_search_result_video.xml
@@ -27,6 +27,7 @@
android:scaleType="fitXY" />
<ImageView
+ android:layout_marginRight="3dp"
android:id="@+id/iv_vip"
android:layout_width="29.5dp"
android:layout_height="17.5dp"
diff --git a/library-search/src/main/res/values/colors.xml b/library-search/src/main/res/values/colors.xml
index f32ac5c..b0ee531 100644
--- a/library-search/src/main/res/values/colors.xml
+++ b/library-search/src/main/res/values/colors.xml
@@ -78,7 +78,7 @@
<color name="video_list_tag_text_color">#ffffff</color>
<color name="video_list_score_text_color">#f8dc9f</color>
<color name="video_episode_text_color">#232323</color>
- <color name="video_episode_bg_color">#EFEFEF</color>
+ <color name="video_episode_bg_color">#F9F9F9</color>
diff --git a/library-search/src/main/res/values/style.xml b/library-search/src/main/res/values/style.xml
index 2c7bba4..3dfa72f 100644
--- a/library-search/src/main/res/values/style.xml
+++ b/library-search/src/main/res/values/style.xml
@@ -9,7 +9,7 @@
<item name="android:layout_weight">1</item>
<item name="android:background">@drawable/shape_video_detail_episode_unselected</item>
<item name="android:gravity">center</item>
- <item name="android:textSize">12sp</item>
+ <item name="android:textSize">14sp</item>
<item name="android:layout_marginLeft">11dp</item>
<item name="android:textColor">@color/video_episode_text_color</item>
</style>
diff --git a/library-video/src/main/java/com/yeshi/video/ui/EpisodeFragment.java b/library-video/src/main/java/com/yeshi/video/ui/EpisodeFragment.java
index 8d9ecdd..9f73eb2 100644
--- a/library-video/src/main/java/com/yeshi/video/ui/EpisodeFragment.java
+++ b/library-video/src/main/java/com/yeshi/video/ui/EpisodeFragment.java
@@ -44,6 +44,7 @@
import com.umeng.socialize.UMShareListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.media.UMWeb;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.db.WatchHistoryTable;
import com.yeshi.base.entity.video.Follow;
import com.yeshi.base.entity.video.Play;
@@ -53,6 +54,7 @@
import com.yeshi.base.entity.video.VideoInfo;
import com.yeshi.base.entity.video.VideoResource;
import com.yeshi.base.utils.BeibeiConstant;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.GDTConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.yeshi.video.R;
@@ -353,6 +355,8 @@
}
private void loadAD() {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) == null)
+ return;
NativeExpressAD nativeExpressAD = new NativeExpressAD(getContext(), new ADSize(ADSize.FULL_WIDTH, ADSize.AUTO_HEIGHT),
GDTConstant.GDT_APP_ID, GDTConstant.GDT_HOME_AND_PLAY_BIG_PICTURE, new NativeExpressAD.NativeExpressADListener() {
@Override
diff --git a/library-video/src/main/java/com/yeshi/video/ui/VideoDetailActivity.java b/library-video/src/main/java/com/yeshi/video/ui/VideoDetailActivity.java
index b0d7baa..21af864 100644
--- a/library-video/src/main/java/com/yeshi/video/ui/VideoDetailActivity.java
+++ b/library-video/src/main/java/com/yeshi/video/ui/VideoDetailActivity.java
@@ -42,6 +42,7 @@
import com.lcjian.library.util.common.StringUtils;
import com.umeng.socialize.UMShareAPI;
import com.yeshi.base.entity.AccumulateRule;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.db.WatchHistoryTable;
import com.yeshi.base.entity.video.Follow;
import com.yeshi.base.entity.video.Play;
@@ -52,6 +53,7 @@
import com.yeshi.base.ui.BaseActivity;
import com.yeshi.base.utils.BeibeiConstant;
import com.yeshi.base.utils.RouteConstant;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.yeshi.video.R;
import com.yeshi.video.entity.PushEpisode;
@@ -111,6 +113,8 @@
private FrameLayout fl_pptv;
private LinearLayout ll_other;
+
+ private boolean adShown = false;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -787,7 +791,7 @@
if (!progressDialog.isShowing()) {
progressDialog.show();
}
- getVideoDetail(this, videoInfo.getId(), videoInfo.getThirdType(), false);
+ getVideoDetail(this, videoInfo.getId(), videoInfo.getThirdType(), true);
}
public void onEventMainThread(Play info) {
@@ -1281,7 +1285,11 @@
* 鍔犺浇鍏ㄥ睆瑙嗛骞垮憡
*/
private void loadFullVideoAd() {
- if (BeibeiConstant.ADSHOW) {
+ if (adShown)
+ return;
+ adShown = true;
+
+ if (AdUtil.getAdType(getApplicationContext(), AdPositionEnum.videoDetailFullVideo) != null) {
FullVideoAdManager.getInstance().loadAd(getApplicationContext(), new FullVideoAdManager.IFullVideoAdListener() {
@Override
public void onSuccess(TTFullScreenVideoAd ad) {
diff --git a/library-video/src/main/java/com/yeshi/video/ui/VideoEpisodeFragment.java b/library-video/src/main/java/com/yeshi/video/ui/VideoEpisodeFragment.java
index ad43f70..051828e 100644
--- a/library-video/src/main/java/com/yeshi/video/ui/VideoEpisodeFragment.java
+++ b/library-video/src/main/java/com/yeshi/video/ui/VideoEpisodeFragment.java
@@ -31,8 +31,10 @@
import com.qq.e.comm.util.AdError;
import com.umeng.analytics.MobclickAgent;
import com.viewpagerindicator.TabPageIndicator;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.video.VideoInfo;
import com.yeshi.base.utils.BeibeiConstant;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.base.utils.ad.GDTConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
import com.yeshi.video.R;
@@ -262,7 +264,7 @@
}
});
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
// loadAD1();
loadAD();
}
@@ -524,6 +526,8 @@
private void loadAD() {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) == null)
+ return;
NativeExpressAD nativeExpressAD = new NativeExpressAD(getContext(), new ADSize(ADSize.FULL_WIDTH, ADSize.AUTO_HEIGHT),
GDTConstant.GDT_APP_ID, GDTConstant.GDT_HOME_AND_PLAY_BIG_PICTURE, new NativeExpressAD.NativeExpressADListener() {
@Override
diff --git a/library-video/src/main/java/com/yeshi/video/ui/VideoPlayerFragment.java b/library-video/src/main/java/com/yeshi/video/ui/VideoPlayerFragment.java
index b4be27f..8fa017f 100644
--- a/library-video/src/main/java/com/yeshi/video/ui/VideoPlayerFragment.java
+++ b/library-video/src/main/java/com/yeshi/video/ui/VideoPlayerFragment.java
@@ -8,8 +8,10 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import com.yeshi.base.entity.ad.AdPositionEnum;
import com.yeshi.base.entity.video.VideoInfo;
import com.yeshi.base.utils.BeibeiConstant;
+import com.yeshi.base.utils.ad.AdUtil;
import com.yeshi.video.R;
import androidx.fragment.app.Fragment;
@@ -57,7 +59,7 @@
}
}
});
- if (BeibeiConstant.ADSHOW) {
+ if (AdUtil.getAdType(getContext(), AdPositionEnum.other) != null) {
showInterstitialAd();
}
diff --git a/library-video/src/main/res/values/colors.xml b/library-video/src/main/res/values/colors.xml
index f32ac5c..b0ee531 100644
--- a/library-video/src/main/res/values/colors.xml
+++ b/library-video/src/main/res/values/colors.xml
@@ -78,7 +78,7 @@
<color name="video_list_tag_text_color">#ffffff</color>
<color name="video_list_score_text_color">#f8dc9f</color>
<color name="video_episode_text_color">#232323</color>
- <color name="video_episode_bg_color">#EFEFEF</color>
+ <color name="video_episode_bg_color">#F9F9F9</color>
--
Gitblit v1.8.0