Skip to content

唐文 / AiyoZhuaWaWa

Go to a project
Commit 71375129 by chengfengpiaopiao
Options

增加友盟统计

parent 51d8488e
Inline Side-by-side
Showing with 66 additions and 29 deletions
.idea/misc.xml
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</profile-state> </profile-state>
</entry> </entry>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
app/build.gradle
...@@ -9,10 +9,12 @@ android { ...@@ -9,10 +9,12 @@ android {
targetSdkVersion 25 targetSdkVersion 25
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
manifestPlaceholders = [UMENG_CHANNEL_VALUE: "test"] //默认名称
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
//配置keystore签名 //配置keystore签名
signingConfigs { signingConfigs {
release { release {
...@@ -23,6 +25,18 @@ android { ...@@ -23,6 +25,18 @@ android {
} }
} }
// productFlavors {
// wandoujia {}
// baidu {}
// c360 {}
// uc {}
// xiaomi {}
// huawei {}
// productFlavors.all { flavor ->
// flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
// }
// }
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
......
app/src/main/AndroidManifest.xml
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<application <application
android:name=".DuoBaoApplication" android:name=".DuoBaoApplication"
android:allowBackup="true" android:allowBackup="true"
...@@ -19,16 +21,16 @@ ...@@ -19,16 +21,16 @@
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<!--58c25576c895767d61000ec7 -->
<meta-data <meta-data
android:name="UMENG_APPKEY" android:name="UMENG_APPKEY"
android:value="58c25576c895767d61000ec7" /> android:value="5a0abb218f4a9d05b0000036" />
<meta-data <!--<meta-data-->
android:name="UMENG_MESSAGE_SECRET" <!--android:name="UMENG_MESSAGE_SECRET"-->
android:value="771f0753ec80810bfced1e7347520fe7"/> <!--android:value="771f0753ec80810bfced1e7347520fe7"/>-->
<meta-data <meta-data
android:name="UMENG_CHANNEL" android:name="UMENG_CHANNEL"
android:value="android-app" /> android:value="${UMENG_CHANNEL_VALUE}" />
<meta-data <meta-data
android:name="TD_CHANNEL_ID" android:name="TD_CHANNEL_ID"
android:value="maile" /> android:value="maile" />
......
app/src/main/java/com/maile/jingcai/base/BaseApplication.java
...@@ -9,6 +9,7 @@ import android.util.Log; ...@@ -9,6 +9,7 @@ import android.util.Log;
import com.maile.jingcai.util.DrawUtil; import com.maile.jingcai.util.DrawUtil;
import com.tencent.mm.opensdk.openapi.IWXAPI; import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory; import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.umeng.analytics.MobclickAgent;
/** /**
......
app/src/main/java/com/maile/jingcai/view/activity/LoginActivity.java
...@@ -30,6 +30,7 @@ import com.maile.jingcai.util.preferences.PreferencesManager; ...@@ -30,6 +30,7 @@ import com.maile.jingcai.util.preferences.PreferencesManager;
import com.maile.jingcai.view.iview.ILoginView; import com.maile.jingcai.view.iview.ILoginView;
import com.maile.jingcai.view.layer.LoginMainLayer; import com.maile.jingcai.view.layer.LoginMainLayer;
import com.maile.jingcai.view.layer.PhoneLayer; import com.maile.jingcai.view.layer.PhoneLayer;
import com.umeng.analytics.MobclickAgent;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.InjectView; import butterknife.InjectView;
...@@ -103,7 +104,6 @@ public class LoginActivity extends Activity implements ILoginView { ...@@ -103,7 +104,6 @@ public class LoginActivity extends Activity implements ILoginView {
alphaAnimIn.setAnimationListener(new Animation.AnimationListener() { alphaAnimIn.setAnimationListener(new Animation.AnimationListener() {
@Override @Override
public void onAnimationStart(Animation animation) { public void onAnimationStart(Animation animation) {
} }
@Override @Override
...@@ -124,6 +124,13 @@ public class LoginActivity extends Activity implements ILoginView { ...@@ -124,6 +124,13 @@ public class LoginActivity extends Activity implements ILoginView {
if (mainLayer != null) { if (mainLayer != null) {
mainLayer.onResume(); mainLayer.onResume();
} }
MobclickAgent.onResume(getApplicationContext());
}
@Override
protected void onPause() {
super.onPause();
MobclickAgent.onPause(mContext);
} }
//检测用户是否登录 //检测用户是否登录
......
app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java
...@@ -87,7 +87,7 @@ public class MainActivity extends FragmentActivity { ...@@ -87,7 +87,7 @@ public class MainActivity extends FragmentActivity {
mDecorView = getWindow().getDecorView(); mDecorView = getWindow().getDecorView();
mViewPager = ViewFindUtils.find(mDecorView, R.id.vp_2); mViewPager = ViewFindUtils.find(mDecorView, R.id.vp_2);
mViewPager.setOffscreenPageLimit(1); mViewPager.setOffscreenPageLimit(2);
mViewPager.setAdapter(new MyPagerAdapter(getSupportFragmentManager())); mViewPager.setAdapter(new MyPagerAdapter(getSupportFragmentManager()));
/** with nothing */ /** with nothing */
/** with ViewPager */ /** with ViewPager */
......
app/src/main/java/com/maile/jingcai/view/fragment/SimpleCardFragment.java
...@@ -69,7 +69,6 @@ public class SimpleCardFragment extends BaseFragment { ...@@ -69,7 +69,6 @@ public class SimpleCardFragment extends BaseFragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fr_simple_card, container, false); View view = inflater.inflate(R.layout.fr_simple_card, container, false);
ButterKnife.inject(this, view); ButterKnife.inject(this, view);
mLoading.setVisibility(View.VISIBLE);
loadWebView(mUrl); loadWebView(mUrl);
return view; return view;
} }
...@@ -88,9 +87,10 @@ public class SimpleCardFragment extends BaseFragment { ...@@ -88,9 +87,10 @@ public class SimpleCardFragment extends BaseFragment {
@Override @Override
public void setUserVisibleHint(boolean isVisibleToUser) { public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser); super.setUserVisibleHint(isVisibleToUser);
if (isVisibleToUser) { if (isVisibleToUser) {
Log.i("tangwen", "onResume: " + mUrl); Log.i("tangwen", "onResume: " + mUrl);
if (mUrl.equals("http://192.168.1.250:81/shop")) { if (mUrl.equals("http://192.168.1.250:81/shop") || mUrl.equals("http://h5.test.7peng.cn/profile.html")) {
Log.i("tangwen", "onResume: " + "第二页"); Log.i("tangwen", "onResume: " + "第二页");
mWebView.loadUrl(mUrl); mWebView.loadUrl(mUrl);
} }
...@@ -104,11 +104,19 @@ public class SimpleCardFragment extends BaseFragment { ...@@ -104,11 +104,19 @@ public class SimpleCardFragment extends BaseFragment {
// loadWebView(mUrl); // loadWebView(mUrl);
} }
@Override
public void onResume() {
super.onResume();
}
//加载webview //加载webview
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@SuppressLint("AddJavascriptInterface") @SuppressLint("AddJavascriptInterface")
private void loadWebView(String url) { private void loadWebView(String url) {
mLoading.setVisibility(View.VISIBLE);
mWebView.setVisibility(View.VISIBLE); mWebView.setVisibility(View.VISIBLE);
WebSettings webSettings = mWebView.getSettings(); WebSettings webSettings = mWebView.getSettings();
webSettings.setSavePassword(false); webSettings.setSavePassword(false);
webSettings.setSaveFormData(false); webSettings.setSaveFormData(false);
...@@ -186,19 +194,21 @@ public class SimpleCardFragment extends BaseFragment { ...@@ -186,19 +194,21 @@ public class SimpleCardFragment extends BaseFragment {
mLoading.setVisibility(View.INVISIBLE); mLoading.setVisibility(View.INVISIBLE);
} }
// super.onPageFinished(view, url); // super.onPageFinished(view, url);
if (!mUrl.equals("http://h5.test.7peng.cn/")) { // if (!mUrl.equals("http://h5.test.7peng.cn/")) {
return; // return;
} // }
isLoading = true; isLoading = true;
Log.i("ggg", "onPageFinished: " + "ggg"); Log.i("ggg", "onPageFinished: " + "ggg");
new Handler().postDelayed(new Runnable() { // new Handler().postDelayed(new Runnable() {
public void run() { // public void run() {
//mWebView.loadUrl("javascript:console.log('ggg'); (function(){localStorage.setItem(\"__token__\", '"+token+"');})();"); // //mWebView.loadUrl("javascript:console.log('ggg'); (function(){localStorage.setItem(\"__token__\", '"+token+"');})();");
mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')"); // mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')");
} // }
}, 2000); // }, 2000);
// mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')");
//mWebView.loadUrl("javascript:console.log('ggg');h5AutoLogin('"+token+"')"); //mWebView.loadUrl("javascript:console.log('ggg');h5AutoLogin('"+token+"')");
......
app/src/main/res/drawable/login_btn.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="25dp" /> <corners android:radius="25dp" />
<solid android:color="#f3d800" /> <solid android:color="#af6d8b" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/login_input_bg.xml
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="#e8e8e9" /> android:color="#e8e8e9" />
<solid android:color="#00FFFFFF" /> <solid android:color="#ffffff" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/layout/fr_simple_card.xml
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<ProgressBar <ProgressBar
android:id="@+id/webView_progress" android:id="@+id/webView_progress"
style="@style/ProgressBar_Mini" style="@style/ProgressBar_Mini"
......
app/src/main/res/layout/layer_login_phone.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
android:gravity="center" android:gravity="center"
android:paddingLeft="40dp" android:paddingLeft="40dp"
android:paddingRight="40dp" android:paddingRight="40dp"
android:background="#ffffff" android:background="#4c443f"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:id="@+id/input_phone_layout" android:id="@+id/input_phone_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="46dp" android:layout_height="46dp"
android:layout_marginTop="66dp" android:layout_marginTop="40dp"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="@drawable/login_input_bg" android:background="@drawable/login_input_bg"
...@@ -83,15 +83,15 @@ ...@@ -83,15 +83,15 @@
android:layout_marginLeft="7dp" android:layout_marginLeft="7dp"
android:textSize="17sp" /> android:textSize="17sp" />
<!-- android:background="@drawable/input_send_checkcode_bg"-->
<com.maile.jingcai.commponent.LoginClickTextView <com.maile.jingcai.commponent.LoginClickTextView
android:id="@+id/tv_checkcode_send" android:id="@+id/tv_checkcode_send"
android:layout_width="122dp" android:layout_width="122dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/login_input_checkcode_send" android:text="@string/login_input_checkcode_send"
android:background="@drawable/input_send_checkcode_bg"
android:gravity="center" android:gravity="center"
android:textSize="17sp" android:textSize="17sp"
android:textColor="#ffffff" android:textColor="#2ebb4f"
/> />
</LinearLayout> </LinearLayout>
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/login_btn" android:background="@drawable/login_btn"
android:layout_below="@+id/login_input_view" android:layout_below="@+id/login_input_view"
android:layout_marginLeft="30dp" android:layout_marginLeft="15dp"
android:layout_marginRight="30dp" android:layout_marginRight="15dp"
android:text="@string/login" android:text="@string/login"
android:gravity="center" android:gravity="center"
android:textColor="#ffffff" android:textColor="#ffffff"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment